X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=prototypes%2Fpuppet-infracloud%2Fmanifests%2Fsite.pp;h=3483b06e5f06597011d508f15d4ba9f5d3710db2;hb=10a7c1ea663ce09f0bcda151c82bfca068f8b588;hp=31c45767f156dc1001efff5740542a09650bde55;hpb=e6f876639ccd52473914919123540668bbe9708a;p=releng.git

diff --git a/prototypes/puppet-infracloud/manifests/site.pp b/prototypes/puppet-infracloud/manifests/site.pp
index 31c45767f..3483b06e5 100644
--- a/prototypes/puppet-infracloud/manifests/site.pp
+++ b/prototypes/puppet-infracloud/manifests/site.pp
@@ -10,13 +10,13 @@ node 'controller00.opnfvlocal' {
   $group = 'infracloud'
   include ::sudoers
 
-  class { 'opnfv::server':
+  class { '::opnfv::server':
     iptables_public_tcp_ports => [80,5000,5671,8774,9292,9696,35357], # logs,keystone,rabbit,nova,glance,neutron,keystone
     sysadmins                 => hiera('sysadmins', []),
     enable_unbound            => false,
     purge_apt_sources         => false,
   }
-  class { 'opnfv::controller':
+  class { '::opnfv::controller':
     keystone_rabbit_password         => hiera('keystone_rabbit_password'),
     neutron_rabbit_password          => hiera('neutron_rabbit_password'),
     nova_rabbit_password             => hiera('nova_rabbit_password'),
@@ -34,12 +34,11 @@ node 'controller00.opnfvlocal' {
     ssl_cert_file_contents           => hiera('ssl_cert_file_contents'),
     br_name                          => hiera('bridge_name'),
     controller_public_address        => $::fqdn,
-    neutron_subnet_cidr              => '192.168.122.0/24',
-    neutron_subnet_gateway           => '192.168.122.1',
-    neutron_subnet_allocation_pools  => [
-                                          'start=192.168.122.50,end=192.168.122.254',
-                                        ],
+    neutron_subnet_cidr              => hiera('neutron_subnet_cidr'),
+    neutron_subnet_gateway           => hiera('neutron_subnet_gateway'),
+    neutron_subnet_allocation_pools  => hiera('neutron_subnet_allocation_pools'),
     opnfv_password                   => hiera('opnfv_password'),
+    require                          => Class['::opnfv::server'],
   }
 }
 
@@ -47,13 +46,13 @@ node 'compute00.opnfvlocal' {
   $group = 'infracloud'
   include ::sudoers
 
-  class { 'opnfv::server':
+  class { '::opnfv::server':
     sysadmins                 => hiera('sysadmins', []),
     enable_unbound            => false,
     purge_apt_sources         => false,
   }
 
-  class { 'opnfv::compute':
+  class { '::opnfv::compute':
     nova_rabbit_password             => hiera('nova_rabbit_password'),
     neutron_rabbit_password          => hiera('neutron_rabbit_password'),
     neutron_admin_password           => hiera('neutron_admin_password'),
@@ -61,19 +60,20 @@ node 'compute00.opnfvlocal' {
     ssl_key_file_contents            => hiera('ssl_key_file_contents'),
     br_name                          => hiera('bridge_name'),
     controller_public_address        => 'controller00.opnfvlocal',
-    virt_type                        => 'qemu',
+    virt_type                        => hiera('virt_type'),
+    require                          => Class['::opnfv::server'],
   }
 }
 
 node 'jumphost.opnfvlocal' {
-  class { 'opnfv::server':
+  class { '::opnfv::server':
     sysadmins                 => hiera('sysadmins', []),
     enable_unbound            => false,
     purge_apt_sources         => false,
   }
 }
 
-node 'baremetal.opnfvlocal' {
+node 'baremetal.opnfvlocal', 'lfpod5-jumpserver' {
   class { '::opnfv::server':
     iptables_public_udp_ports => [67, 69],
     sysadmins                 => hiera('sysadmins', []),
@@ -91,10 +91,14 @@ node 'baremetal.opnfvlocal' {
     vlan                      => hiera('infracloud_vlan'),
     gateway_ip                => hiera('infracloud_gateway_ip'),
     default_network_interface => hiera('default_network_interface'),
+    dhcp_static_mask          => hiera('dhcp_static_mask'),
     dhcp_pool_start           => hiera('dhcp_pool_start'),
     dhcp_pool_end             => hiera('dhcp_pool_end'),
     network_interface         => hiera('network_interface'),
     ipv4_nameserver           => hiera('ipv4_nameserver'),
     ipv4_subnet_mask          => hiera('ipv4_subnet_mask'),
+    bridge_name               => hiera('bridge_name'),
+    dib_dev_user_password     => hiera('dib_dev_user_password'),
+    require                   => Class['::opnfv::server'],
   }
 }