From e1f7de94457c13e5a3f620eb345ccafa2736c80b Mon Sep 17 00:00:00 2001 From: Ricardo Carrillo Cruz Date: Tue, 23 Aug 2016 09:14:25 +0200 Subject: [PATCH] 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 --- manifests/site.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 7b2e186ccb..556e12af4d 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -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', } }