diff --git a/manifests/site.pp b/manifests/site.pp index cb057d55f2..86be63faf4 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1177,4 +1177,20 @@ node 'controller00.hpuswest.ic.openstack.org' { } } +node /^compute\d{3}\.hpuswest\.ic\.openstack\.org$/ { + $group = 'infracloud' + class { '::openstack_project::server': + sysadmins => hiera('sysadmins', []), + enable_unbound => false, + } + class { '::openstack_project::infracloud::compute': + nova_rabbit_password => hiera('nova_rabbit_password'), + neutron_rabbit_password => hiera('neutron_rabbit_password'), + neutron_admin_password => hiera('neutron_admin_password'), + br_name => 'br-vlan25', + controller_management_address => '10.10.16.146', + controller_public_address => 'controller00.hpuswest.ic.openstack.org', + } +} + # vim:sw=2:ts=2:expandtab:textwidth=79 diff --git a/modules/openstack_project/manifests/infracloud/compute.pp b/modules/openstack_project/manifests/infracloud/compute.pp new file mode 100644 index 0000000000..c2bf5f25f8 --- /dev/null +++ b/modules/openstack_project/manifests/infracloud/compute.pp @@ -0,0 +1,17 @@ +class openstack_project::infracloud::compute ( + $nova_rabbit_password, + $neutron_rabbit_password, + $neutron_admin_password, + $br_name, + $controller_management_address, + $controller_public_address, +) { + class { '::infracloud::compute': + nova_rabbit_password => $nova_rabbit_password, + neutron_rabbit_password => $neutron_rabbit_password, + neutron_admin_password => $neutron_admin_password, + br_name => $br_name, + controller_management_address => $controller_management_address, + controller_public_address => $controller_public_address, + } +}