Change hpuswest for vanilla on controller and compute node definitions

The naming changed from hpuswest to vanilla, we need to change
this to get Puppet working.

Change-Id: I074ddc9cf5ebf97f628f6afb553f5837729153b9
This commit is contained in:
Ricardo Carrillo Cruz 2016-08-23 09:14:25 +02:00
parent 4c8d90e053
commit e1f7de9445

View File

@ -1222,7 +1222,7 @@ node /.*wheel-mirror-.*\.openstack\.org/ {
}
# Node-OS: trusty
node 'controller00.hpuswest.ic.openstack.org' {
node 'controller00.vanilla.ic.openstack.org' {
$group = 'infracloud'
class { '::openstack_project::server':
iptables_public_tcp_ports => [80,5000,5671,8774,9292,9696,35357], # logs,keystone,rabbit,nova,glance,neutron,keystone
@ -1294,7 +1294,7 @@ node 'controller00.hpuseast.ic.openstack.org' {
}
}
node /^compute\d{3}\.hpuswest\.ic\.openstack\.org$/ {
node /^compute\d{3}\.vanilla\.ic\.openstack\.org$/ {
$group = 'infracloud'
class { '::openstack_project::server':
sysadmins => hiera('sysadmins', []),
@ -1307,7 +1307,7 @@ node /^compute\d{3}\.hpuswest\.ic\.openstack\.org$/ {
neutron_admin_password => hiera('neutron_admin_password'),
ssl_cert_file_contents => hiera('infracloud_hpuswest_ssl_cert_file_contents'),
br_name => 'br-vlan25',
controller_public_address => 'controller00.hpuswest.ic.openstack.org',
controller_public_address => 'controller00.vanilla.ic.openstack.org',
}
}