opendev/system-config
Code Issues Proposed changes

Merge "Add Infra Cloud compute node definition"

Browse Source
This commit is contained in:
Jenkins 2016-02-09 00:31:42 +00:00 committed by Gerrit Code Review
commit c3cbaa0f43
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/site.pp
View File

@ -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

17
modules/openstack_project/manifests/infracloud/compute.pp Normal file
View File

@ -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,
}
}