Fix inputs in resources

f2s/resources/apache/meta.yaml

@@ -1,7 +1,10 @@
 id: apache
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   apache_ports:
     value: null
   fqdn:

f2s/resources/api-proxy/meta.yaml

@@ -1,7 +1,10 @@
 id: api-proxy
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   apache_ports:
     value: null
   fqdn:

f2s/resources/ceilometer-compute/meta.yaml

@@ -1,7 +1,10 @@
 id: ceilometer-compute
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   puppet_modules:

f2s/resources/ceilometer-controller/meta.yaml

@@ -1,7 +1,10 @@
 id: ceilometer-controller
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   ceilometer:
     value: null
   debug:

f2s/resources/ceilometer-keystone/meta.yaml

@@ -1,7 +1,10 @@
 id: ceilometer-keystone
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   ceilometer:
     value: null
   fqdn:

f2s/resources/ceilometer-radosgw-user/meta.yaml

@@ -1,7 +1,10 @@
 id: ceilometer-radosgw-user
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   ceilometer:
     value: null
   fqdn:

f2s/resources/ceph-compute/meta.yaml

@@ -1,7 +1,10 @@
 id: ceph-compute
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   puppet_modules:

f2s/resources/ceph-mon/meta.yaml

@@ -1,7 +1,10 @@
 id: ceph-mon
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   ceph_monitor_nodes:
     value: null
   ceph_primary_monitor_node:

f2s/resources/ceph-radosgw/meta.yaml

@@ -1,7 +1,10 @@
 id: ceph-radosgw
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   ceph_monitor_nodes:
     value: null
   fqdn:

f2s/resources/ceph_create_pools/meta.yaml

@@ -1,7 +1,10 @@
 id: ceph_create_pools
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   puppet_modules:

f2s/resources/cinder-db/meta.yaml

@@ -1,7 +1,10 @@
 id: cinder-db
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   cinder:
     value: null
   database_vip:

f2s/resources/cinder-keystone/meta.yaml

@@ -1,7 +1,10 @@
 id: cinder-keystone
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   cinder:
     value: null
   fqdn:

f2s/resources/cluster-haproxy/meta.yaml

@@ -1,7 +1,10 @@
 id: cluster-haproxy
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   database_vip:
     value: null
   debug:

f2s/resources/cluster-vrouter/meta.yaml

@@ -1,7 +1,10 @@
 id: cluster-vrouter
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   network_scheme:

f2s/resources/cluster/meta.yaml

@@ -1,7 +1,10 @@
 id: cluster
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   corosync_roles:
     value: null
   fqdn:

f2s/resources/cluster_health/meta.yaml

@@ -1,7 +1,10 @@
 id: cluster_health
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   corosync_disk_monitor:
     value: null
   corosync_disk_monitor_interval:

f2s/resources/configure_default_route/meta.yaml

@@ -1,7 +1,10 @@
 id: configure_default_route
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   puppet_modules:

f2s/resources/connectivity_tests/meta.yaml

@@ -1,7 +1,10 @@
 id: connectivity_tests
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   puppet_modules:

f2s/resources/conntrackd/meta.yaml

@@ -1,7 +1,10 @@
 id: conntrackd
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   network_scheme:

f2s/resources/controller_remaining_tasks/meta.yaml

@@ -1,7 +1,10 @@
 id: controller_remaining_tasks
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   neutron_mellanox:

f2s/resources/database/meta.yaml

@@ -1,7 +1,10 @@
 id: database
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   database_nodes:
     value: null
   database_vip:

f2s/resources/disable_keystone_service_token/meta.yaml

@@ -1,7 +1,10 @@
 id: disable_keystone_service_token
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   keystone_hash:

f2s/resources/dns-client/meta.yaml

@@ -1,7 +1,10 @@
 id: dns-client
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   management_vrouter_vip:

f2s/resources/dns-server/meta.yaml

@@ -1,7 +1,10 @@
 id: dns-server
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   external_dns:
     value: null
   fqdn:

f2s/resources/dump_rabbitmq_definitions/actions/run.pp

@@ -1,6 +1,7 @@
 notice('MODULAR: dump_rabbitmq_definitions.pp')
 
 $definitions_dump_file = '/etc/rabbitmq/definitions'
+$original_definitions_dump_file = '/etc/rabbitmq/definitions.full'
 $rabbit_hash     = hiera_hash('rabbit_hash',
     {
       'user'     => false,
@@ -16,10 +17,14 @@ if ($rabbit_enabled) {
 
   exec { 'rabbitmq-dump-definitions':
     path    => ['/usr/bin', '/usr/sbin', '/sbin', '/bin'],
-    command => "curl -u ${rabbit_credentials} ${rabbit_api_endpoint} -o ${definitions_dump_file}",
+    command => "curl -u ${rabbit_credentials} ${rabbit_api_endpoint} -o ${original_definitions_dump_file}",
+  }->
+  exec { 'rabbitmq-dump-clean':
+    path    => ['/usr/bin', '/usr/sbin', '/sbin', '/bin'],
+    command => "rabbitmq-dump-clean.py < ${original_definitions_dump_file} > ${definitions_dump_file}",
   }
 
-  file { $definitions_dump_file:
+  file { [$definitions_dump_file, $original_definitions_dump_file]:
     ensure => file,
     owner  => 'root',
     group  => 'root',

f2s/resources/dump_rabbitmq_definitions/meta.yaml

@@ -1,7 +1,10 @@
 id: dump_rabbitmq_definitions
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   puppet_modules:

f2s/resources/enable_cinder_volume_service/meta.yaml

@@ -1,7 +1,10 @@
 id: enable_cinder_volume_service
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   puppet_modules:

f2s/resources/enable_nova_compute_service/meta.yaml

@@ -1,7 +1,10 @@
 id: enable_nova_compute_service
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   puppet_modules:

f2s/resources/enable_rados/meta.yaml

@@ -1,7 +1,10 @@
 id: enable_rados
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   puppet_modules:

f2s/resources/firewall/actions/run.pp

@@ -50,6 +50,7 @@ class { 'openstack::firewall' :
   nova_api_ip_range => get_network_role_property('nova/api', 'network'),
   libvirt_network   => get_network_role_property('management', 'network'),
   keystone_network  => get_network_role_property('keystone/api', 'network'),
+  iscsi_ip          => get_network_role_property('cinder/iscsi', 'ipaddr'),
 }
 
 if $ironic_hash['enabled'] {

f2s/resources/firewall/meta.yaml

@@ -1,7 +1,10 @@
 id: firewall
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   ironic:

f2s/resources/fuel_pkgs/meta.yaml

@@ -1,7 +1,10 @@
 id: fuel_pkgs
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   puppet_modules:

f2s/resources/generate_vms/meta.yaml

@@ -1,7 +1,10 @@
 id: generate_vms
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   puppet_modules:

f2s/resources/genkeys/meta.yaml

@@ -1,7 +1,7 @@
 id: genkeys
 handler: shell
 version: 0.0.1
-inputs:
+input:
     uid:
         schema: str!
         value:

f2s/resources/glance-db/meta.yaml

@@ -1,7 +1,10 @@
 id: glance-db
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   database_vip:
     value: null
   fqdn:

f2s/resources/glance-keystone/meta.yaml

@@ -1,7 +1,10 @@
 id: glance-keystone
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   glance:

f2s/resources/glance/meta.yaml

@@ -1,7 +1,10 @@
 id: glance
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   amqp_hosts:
     value: null
   ceilometer:

f2s/resources/globals/meta.yaml

@@ -1,7 +1,10 @@
 id: globals
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   access:
     value: null
   amqp_hosts:

f2s/resources/heat-db/meta.yaml

@@ -1,7 +1,10 @@
 id: heat-db
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   database_vip:
     value: null
   fqdn:

f2s/resources/heat-keystone/meta.yaml

@@ -1,7 +1,10 @@
 id: heat-keystone
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   heat:

f2s/resources/heat/meta.yaml

@@ -1,7 +1,10 @@
 id: heat
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   amqp_hosts:
     value: null
   database_vip:

f2s/resources/hiera/meta.yaml

@@ -1,7 +1,10 @@
 id: hiera
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   puppet_modules:

f2s/resources/horizon/meta.yaml

@@ -1,7 +1,10 @@
 id: horizon
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   apache_ports:
     value: null
   debug:

f2s/resources/hosts/meta.yaml

@@ -1,7 +1,10 @@
 id: hosts
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   nodes:

f2s/resources/ironic-api/meta.yaml

@@ -1,7 +1,10 @@
 id: ironic-api
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   ironic:
     value: null
   puppet_modules:

f2s/resources/ironic-compute/meta.yaml

@@ -1,7 +1,10 @@
 id: ironic-compute
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   puppet_modules:

f2s/resources/ironic-conductor/meta.yaml

@@ -1,7 +1,10 @@
 id: ironic-conductor
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   puppet_modules:

f2s/resources/ironic-db/meta.yaml

@@ -1,7 +1,10 @@
 id: ironic-db
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   database_vip:
     value: null
   fqdn:

f2s/resources/ironic-keystone/meta.yaml

@@ -1,7 +1,10 @@
 id: ironic-keystone
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   ironic:

f2s/resources/keystone-db/meta.yaml

@@ -1,7 +1,10 @@
 id: keystone-db
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   database_vip:
     value: null
   fqdn:

f2s/resources/keystone/actions/run.pp

@@ -234,3 +234,9 @@ if ($::operatingsystem == 'Ubuntu') {
     package_name => 'keystone',
   }
 }
+
+# Override confguration options
+$override_configuration = hiera_hash('configuration', {})
+override_resources { 'keystone_config':
+  data => $override_configuration['keystone_config']
+}

f2s/resources/keystone/meta.yaml

@@ -1,7 +1,10 @@
 id: keystone
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   access:
     value: null
   amqp_hosts:

f2s/resources/logging/meta.yaml

@@ -1,7 +1,10 @@
 id: logging
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   base_syslog_hash:
     value: null
   debug:

f2s/resources/memcached/meta.yaml

@@ -1,7 +1,10 @@
 id: memcached
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   network_scheme:

f2s/resources/murano-db/meta.yaml

@@ -1,7 +1,10 @@
 id: murano-db
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   database_vip:
     value: null
   fqdn:

f2s/resources/murano-keystone/meta.yaml

@@ -1,7 +1,10 @@
 id: murano-keystone
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   management_vip:

f2s/resources/murano-rabbitmq/actions/run.pp

@@ -0,0 +1,13 @@
+notice('MODULAR: murano/rabbitmq.pp')
+
+$rabbit_hash                = hiera_hash('rabbit_hash', {})
+
+#################################################################
+
+rabbitmq_vhost { '/murano': }
+
+rabbitmq_user_permissions { "${rabbit_hash['user']}@/murano":
+    configure_permission => '.*',
+    read_permission      => '.*',
+    write_permission     => '.*',
+}

f2s/resources/murano-rabbitmq/meta.yaml

@@ -0,0 +1,7 @@
+id: murano-rabbitmq
+handler: puppetv2
+version: '8.0'
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input: {}

f2s/resources/murano/actions/run.pp

@@ -5,7 +5,6 @@ prepare_network_config(hiera('network_scheme', {}))
 $murano_hash                = hiera_hash('murano_hash', {})
 $murano_settings_hash       = hiera_hash('murano_settings', {})
 $rabbit_hash                = hiera_hash('rabbit_hash', {})
-$heat_hash                  = hiera_hash('heat_hash', {})
 $neutron_config             = hiera_hash('neutron_config', {})
 $node_role                  = hiera('node_role')
 $public_ip                  = hiera('public_vip')
@@ -80,24 +79,26 @@ if $murano_hash['enabled'] {
     use_stderr          => $use_stderr,
     log_facility        => $syslog_log_facility_murano,
     database_connection => $sql_connection,
-    keystone_uri        => "${public_protocol}://${public_address}:5000/v2.0/",
+    auth_uri            => "${public_protocol}://${public_address}:5000/v2.0/",
-    keystone_username   => $murano_user,
+    admin_user          => $murano_user,
-    keystone_password   => $murano_hash['user_password'],
+    admin_password      => $murano_hash['user_password'],
-    keystone_tenant     => $tenant,
+    admin_tenant_name   => $tenant,
     identity_uri        => "http://${service_endpoint}:35357/",
     use_neutron         => $use_neutron,
     rabbit_os_user      => $rabbit_hash['user'],
     rabbit_os_password  => $rabbit_hash['password'],
     rabbit_os_port      => $amqp_port,
-    rabbit_os_hosts     => split($amqp_hosts, ','),
+    rabbit_os_host      => split($amqp_hosts, ','),
     rabbit_ha_queues    => $rabbit_ha_queues,
     rabbit_own_host     => $public_ip,
-    rabbit_own_port     => '55572',
+    rabbit_own_port     => $amqp_port,
-    rabbit_own_user     => 'murano',
+    rabbit_own_vhost    => 'murano',
-    rabbit_own_password => $heat_hash['rabbit_password'],
+    rabbit_own_user     => $rabbit_hash['user'],
+    rabbit_own_password => $rabbit_hash['password'],
     service_host        => $api_bind_host,
     service_port        => $api_bind_port,
     external_network    => $external_network,
+    use_trusts          => true,
   }
 
   class { 'murano::api':
@@ -114,12 +115,6 @@ if $murano_hash['enabled'] {
     repo_url => $repository_url,
   }
 
-  class { 'murano::rabbitmq':
-    rabbit_user     => 'murano',
-    rabbit_password => $heat_hash['rabbit_password'],
-    rabbit_port     => '55572',
-  }
-
   $haproxy_stats_url = "http://${management_ip}:10000/;csv"
 
   haproxy_backend_status { 'murano-api' :
@@ -138,20 +133,13 @@ if $murano_hash['enabled'] {
       url   => $haproxy_stats_url,
     }
 
-    murano::application { 'io.murano' :
+    murano::application { 'io.murano' : }
-      os_tenant_name => $tenant,
-      os_username    => $murano_user,
-      os_password    => $murano_hash['user_password'],
-      os_auth_url    => "${public_protocol}://${public_address}:5000/v2.0/",
-      os_region      => $region,
-      mandatory      => true,
-    }
 
     Haproxy_backend_status['keystone-admin'] -> Haproxy_backend_status['murano-api']
     Haproxy_backend_status['keystone-public'] -> Haproxy_backend_status['murano-api']
     Haproxy_backend_status['murano-api'] -> Murano::Application['io.murano']
 
-    Service['murano-api'] -> Murano::Application<| mandatory == true |>
+    Service['murano-api'] -> Murano::Application['io.murano']
   }
 
   Firewall[$firewall_rule] -> Class['murano::api']

f2s/resources/murano/meta.yaml

@@ -1,7 +1,10 @@
 id: murano
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   amqp_hosts:
     value: null
   amqp_port:

f2s/resources/netconfig/meta.yaml

@@ -1,7 +1,10 @@
 id: netconfig
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   default_gateway:
     value: null
   fqdn:

f2s/resources/neutron-db/meta.yaml

@@ -1,7 +1,10 @@
 id: neutron-db
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   database_vip:
     value: null
   fqdn:

f2s/resources/neutron-keystone/meta.yaml

@@ -1,7 +1,10 @@
 id: neutron-keystone
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   management_vip:

f2s/resources/nova-db/meta.yaml

@@ -1,7 +1,10 @@
 id: nova-db
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   database_vip:
     value: null
   fqdn:

f2s/resources/nova-keystone/meta.yaml

@@ -1,7 +1,10 @@
 id: nova-keystone
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   management_vip:

f2s/resources/ntp-check/meta.yaml

@@ -1,7 +1,10 @@
 id: ntp-check
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   external_ntp:
     value: null
   fqdn:

f2s/resources/ntp-client/meta.yaml

@@ -1,7 +1,10 @@
 id: ntp-client
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   puppet_modules:

f2s/resources/ntp-server/meta.yaml

@@ -1,7 +1,10 @@
 id: ntp-server
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   external_ntp:
     value: null
   fqdn:

f2s/resources/openstack-cinder/meta.yaml

@@ -1,7 +1,10 @@
 id: openstack-cinder
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   amqp_hosts:
     value: null
   ceilometer_hash:

f2s/resources/openstack-controller/meta.yaml

@@ -1,7 +1,10 @@
 id: openstack-controller
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   access:
     value: null
   amqp_hosts:

f2s/resources/openstack-haproxy-ceilometer/meta.yaml

@@ -1,7 +1,10 @@
 id: openstack-haproxy-ceilometer
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   ceilometer:
     value: null
   ceilometer_nodes:

f2s/resources/openstack-haproxy-cinder/meta.yaml

@@ -1,7 +1,10 @@
 id: openstack-haproxy-cinder
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   cinder_hash:
     value: null
   cinder_ipaddresses:

f2s/resources/openstack-haproxy-glance/meta.yaml

@@ -1,7 +1,10 @@
 id: openstack-haproxy-glance
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   glance:

f2s/resources/openstack-haproxy-heat/meta.yaml

@@ -1,7 +1,10 @@
 id: openstack-haproxy-heat
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   heat:

f2s/resources/openstack-haproxy-horizon/meta.yaml

@@ -1,7 +1,10 @@
 id: openstack-haproxy-horizon
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   horizon:

f2s/resources/openstack-haproxy-ironic/meta.yaml

@@ -1,7 +1,10 @@
 id: openstack-haproxy-ironic
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   ironic:
     value: null
   puppet_modules:

f2s/resources/openstack-haproxy-keystone/meta.yaml

@@ -1,7 +1,10 @@
 id: openstack-haproxy-keystone
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   keystone:

f2s/resources/openstack-haproxy-murano/meta.yaml

@@ -1,7 +1,10 @@
 id: openstack-haproxy-murano
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   murano_hash:

f2s/resources/openstack-haproxy-mysqld/meta.yaml

@@ -1,7 +1,10 @@
 id: openstack-haproxy-mysqld
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   custom_mysql_setup_class:
     value: null
   database_nodes:

f2s/resources/openstack-haproxy-neutron/meta.yaml

@@ -1,7 +1,10 @@
 id: openstack-haproxy-neutron
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   management_vip:

f2s/resources/openstack-haproxy-nova/meta.yaml

@@ -1,7 +1,10 @@
 id: openstack-haproxy-nova
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   management_vip:

f2s/resources/openstack-haproxy-radosgw/actions/run.pp

@@ -3,7 +3,7 @@ notice('MODULAR: openstack-haproxy-radosgw.pp')
 $network_metadata = hiera_hash('network_metadata')
 $storage_hash     = hiera_hash('storage', {})
 $public_ssl_hash  = hiera('public_ssl')
-
+$ironic_hash      = hiera_hash('ironic', {})
 
 if !($storage_hash['images_ceph'] and $storage_hash['objects_ceph']) and !$storage_hash['images_vcenter'] {
   $use_swift = true
@@ -23,12 +23,17 @@ if $use_radosgw {
   $public_virtual_ip   = hiera('public_vip')
   $internal_virtual_ip = hiera('management_vip')
 
+  if $ironic_hash['enabled'] {
+    $baremetal_virtual_ip = $network_metadata['vips']['baremetal']['ipaddr']
+  }
+
   # configure radosgw ha proxy
   class { '::openstack::ha::radosgw':
-    internal_virtual_ip => $internal_virtual_ip,
+    internal_virtual_ip  => $internal_virtual_ip,
-    ipaddresses         => $ipaddresses,
+    ipaddresses          => $ipaddresses,
-    public_virtual_ip   => $public_virtual_ip,
+    public_virtual_ip    => $public_virtual_ip,
-    server_names        => $server_names,
+    server_names         => $server_names,
-    public_ssl          => $public_ssl_hash['services'],
+    public_ssl           => $public_ssl_hash['services'],
+    baremetal_virtual_ip => $baremetal_virtual_ip,
   }
 }

f2s/resources/openstack-haproxy-radosgw/meta.yaml

@@ -1,7 +1,10 @@
 id: openstack-haproxy-radosgw
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   network_metadata:

f2s/resources/openstack-haproxy-sahara/meta.yaml

@@ -1,7 +1,10 @@
 id: openstack-haproxy-sahara
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   network_metadata:

f2s/resources/openstack-haproxy-stats/meta.yaml

@@ -1,7 +1,10 @@
 id: openstack-haproxy-stats
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   database_vip:
     value: null
   fqdn:

f2s/resources/openstack-haproxy-swift/meta.yaml

@@ -1,7 +1,10 @@
 id: openstack-haproxy-swift
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   ironic:

f2s/resources/openstack-haproxy/meta.yaml

@@ -1,7 +1,10 @@
 id: openstack-haproxy
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   puppet_modules:

f2s/resources/openstack-network-agents-dhcp/actions/run.pp

@@ -30,7 +30,7 @@ if $use_neutron {
     }
   }
 
-  #========================
+  # stub package for 'neutron::agents::dhcp' class
   package { 'neutron':
     name   => 'binutils',
     ensure => 'installed',

f2s/resources/openstack-network-agents-dhcp/meta.yaml

@@ -1,7 +1,10 @@
 id: openstack-network-agents-dhcp
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   debug:
     value: null
   fqdn:

f2s/resources/openstack-network-agents-l3/actions/run.pp

@@ -50,7 +50,7 @@ if $use_neutron and ($controller or ($dvr and $compute)) {
     }
   }
 
-  #========================
+  # stub package for 'neutron::agents::l3' class
   package { 'neutron':
     name   => 'binutils',
     ensure => 'installed',

f2s/resources/openstack-network-agents-l3/meta.yaml

@@ -1,7 +1,10 @@
 id: openstack-network-agents-l3
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   debug:
     value: null
   fqdn:

f2s/resources/openstack-network-agents-metadata/actions/run.pp

@@ -38,7 +38,6 @@ if $use_neutron {
     metadata_ip    => $nova_endpoint,
     manage_service => true,
     enabled        => true,
-
   }
 
   if $ha_agent {
@@ -48,7 +47,7 @@ if $use_neutron {
     }
   }
 
-  #========================
+  # stub package for 'neutron::agents::metadata' class
   package { 'neutron':
     name   => 'binutils',
     ensure => 'installed',

f2s/resources/openstack-network-agents-metadata/meta.yaml

@@ -1,7 +1,10 @@
 id: openstack-network-agents-metadata
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   debug:
     value: null
   fqdn:

f2s/resources/openstack-network-common-config/meta.yaml

@@ -1,7 +1,10 @@
 id: openstack-network-common-config
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   amqp_hosts:
     value: null
   ceilometer:

f2s/resources/openstack-network-compute-nova/meta.yaml

@@ -1,7 +1,10 @@
 id: openstack-network-compute-nova
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   puppet_modules:

f2s/resources/openstack-network-networks/meta.yaml

@@ -1,7 +1,10 @@
 id: openstack-network-networks
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   access:
     value: null
   fqdn:

f2s/resources/openstack-network-plugins-l2/actions/run.pp

@@ -48,16 +48,15 @@ if $use_neutron {
     $physnet_ironic_bridge = try_get_value($neutron_config, 'L2/phys_nets/physnet-ironic/bridge', false)
 
     if $physnet_ironic_bridge {
-      $physnet_ironic = "physnet-ironic:${physnet_ironic_bridge}"
+      $bridge_mappings = [$physnet2, "physnet-ironic:${physnet_ironic_bridge}"]
-    }else {
+    } else {
-      $physnet_ironic = []
+      $bridge_mappings = [$physnet2]
     }
 
-    $physnets_array = [$physnet2, $physnet_ironic]
-    $bridge_mappings = delete_undef_values($physnets_array)
     $physical_network_mtus = ["physnet2:${physical_net_mtu}"]
     $tunnel_id_ranges = []
     $network_type = 'vlan'
+    $tunnel_types = []
   } else {
     $net_role_property = 'neutron/mesh'
     $tunneling_ip      = get_network_role_property($net_role_property, 'ipaddr')
@@ -75,6 +74,7 @@ if $use_neutron {
       $mtu_offset = '50'
       $network_type = 'vxlan'
     }
+    $tunnel_types = [$network_type]
 
     if $physical_net_mtu {
       $overlay_net_mtu = $physical_net_mtu - $mtu_offset
@@ -83,7 +83,6 @@ if $use_neutron {
     }
 
     $enable_tunneling = true
-    $tunnel_types = [$network_type]
   }
 
   $type_drivers = ['local', 'flat', 'vlan', 'gre', 'vxlan']

f2s/resources/openstack-network-plugins-l2/meta.yaml

@@ -1,7 +1,10 @@
 id: openstack-network-plugins-l2
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   fqdn:
     value: null
   management_vip:

f2s/resources/openstack-network-routers/meta.yaml

@@ -1,7 +1,10 @@
 id: openstack-network-routers
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   access:
     value: null
   fqdn:

f2s/resources/openstack-network-server-config/meta.yaml

@@ -1,7 +1,10 @@
 id: openstack-network-server-config
 handler: puppetv2
 version: '8.0'
-inputs:
+actions:
+  run: actions/run.pp
+  update: actions/run.pp
+input:
   database_vip:
     value: null
   fqdn: