X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=prototypes%2Fpuppet-infracloud%2Fmanifests%2Fsite.pp;h=3483b06e5f06597011d508f15d4ba9f5d3710db2;hb=60291ea30d941559e3d380d435a495502b3c80b9;hp=4f33ae073856665d9d360b16d3d0c9f74f56a0d6;hpb=221956946efb7c655d05b5d582d87bd3c917ff39;p=releng.git

diff --git a/prototypes/puppet-infracloud/manifests/site.pp b/prototypes/puppet-infracloud/manifests/site.pp
index 4f33ae073..3483b06e5 100644
--- a/prototypes/puppet-infracloud/manifests/site.pp
+++ b/prototypes/puppet-infracloud/manifests/site.pp
@@ -8,13 +8,15 @@
 ##############################################################################
 node 'controller00.opnfvlocal' {
   $group = 'infracloud'
-  class { 'opnfv::server':
+  include ::sudoers
+
+  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'),
@@ -30,41 +32,73 @@ node 'controller00.opnfvlocal' {
     keystone_admin_token             => hiera('keystone_admin_token'),
     ssl_key_file_contents            => hiera('ssl_key_file_contents'),
     ssl_cert_file_contents           => hiera('ssl_cert_file_contents'),
-    br_name                          => 'br-eth0',
+    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'],
   }
 }
 
 node 'compute00.opnfvlocal' {
   $group = 'infracloud'
-  class { 'opnfv::server':
+  include ::sudoers
+
+  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'),
     ssl_cert_file_contents           => hiera('ssl_cert_file_contents'),
     ssl_key_file_contents            => hiera('ssl_key_file_contents'),
-    br_name                          => 'br-eth0',
+    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', 'lfpod5-jumpserver' {
+  class { '::opnfv::server':
+    iptables_public_udp_ports => [67, 69],
     sysadmins                 => hiera('sysadmins', []),
     enable_unbound            => false,
     purge_apt_sources         => false,
   }
+
+  class { '::infracloud::bifrost':
+    ironic_inventory          => hiera('ironic_inventory', {}),
+    ironic_db_password        => hiera('ironic_db_password'),
+    mysql_password            => hiera('bifrost_mysql_password'),
+    ipmi_passwords            => hiera('ipmi_passwords'),
+    ssh_private_key           => hiera('bifrost_ssh_private_key'),
+    ssh_public_key            => hiera('bifrost_ssh_public_key'),
+    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'],
+  }
 }