From c4aace64ad78f45d76d0d308afeaf468db33edbf Mon Sep 17 00:00:00 2001 From: Spencer Krum Date: Mon, 8 Feb 2016 15:27:48 -0800 Subject: [PATCH] Collapse groups into one group We only need one infracloud right now. Technically the controller doesn't need to be in 'infracloud' because its secrets are duplicated. This aligns the groups at any rate. Change-Id: Ibc056505a4ef397c2adeae6a3b4afb21db9b4a02 --- modules/openstack_project/files/puppetmaster/infracloud | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/modules/openstack_project/files/puppetmaster/infracloud b/modules/openstack_project/files/puppetmaster/infracloud index 7c529dd739..869f8e177a 100644 --- a/modules/openstack_project/files/puppetmaster/infracloud +++ b/modules/openstack_project/files/puppetmaster/infracloud @@ -1,13 +1,9 @@ # this disables infracloud until we are ready [disabled:children] -infracloud-west-compute -infracloud-west-controller +infracloud -[infracloud-west-controller] +[infracloud] controller00.hpuswest.ic.openstack.org - - -[infracloud-west-compute] compute000.hpuswest.ic.openstack.org compute001.hpuswest.ic.openstack.org compute002.hpuswest.ic.openstack.org @@ -53,4 +49,3 @@ compute038.hpuswest.ic.openstack.org compute041.hpuswest.ic.openstack.org compute042.hpuswest.ic.openstack.org compute043.hpuswest.ic.openstack.org -