Cleanup nodepool builder clouds.yaml

We ended up running into a problem with nodepool built control plane
images (has to do with boot from volume not allowing us to delete images
that are in use by a nova instance). We have decided to clean this up
and go back to not doing this until we can do it more properly.

Note this isn't a revert because having a group for access to control
plane clouds does seem like a good idea in general and I believe there
have been changes we'd have to resolve in the clouds.yaml files anyway.

Depends-On: https://review.opendev.org/#/c/665012/
Change-Id: I5e72928ec2dec37afa9c8567eff30eb6e9c04f1d
This commit is contained in:
Clark Boylan 2019-06-12 13:59:09 -07:00
parent a2af942fa3
commit ffcd1791bf
6 changed files with 4 additions and 7 deletions

View File

@ -16,7 +16,6 @@ groups:
cacti: cacti[0-9]*.open*.org
control-plane-clouds:
- bridge.openstack.org
- nb[0-9]*.open*.org
disabled:
- backup01.ord.rax.ci.openstack.org
- corvustest

View File

@ -1,4 +1,4 @@
openstacksdk_config_dir: /home/nodepool/.config/openstack
openstacksdk_config_owner: nodepool
openstacksdk_config_group: nodepool
openstacksdk_config_template: clouds/nodepool_builder_clouds.yaml.j2
openstacksdk_config_template: clouds/nodepool_clouds.yaml.j2

View File

@ -1,4 +1,4 @@
openstacksdk_config_dir: /home/nodepool/.config/openstack
openstacksdk_config_owner: nodepool
openstacksdk_config_group: nodepool
openstacksdk_config_template: clouds/nodepool_launcher_clouds.yaml.j2
openstacksdk_config_template: clouds/nodepool_clouds.yaml.j2

View File

@ -65,7 +65,6 @@ results:
- puppet
- puppet4
- webservers
- control-plane-clouds
ze01.openstack.org:
- afs-client

View File

@ -1,7 +1,7 @@
#
# Nodepool openstacksdk configuration
#
# This file is deployed to nodepool launcher hosts as
# This file is deployed to nodepool launcher and builder hosts as
#
# ~nodepool/.config/openstack/config/clouds.yaml
#

View File

@ -21,8 +21,7 @@ import sys
import tempfile
FILES_TO_CHECK = (
'playbooks/templates/clouds/nodepool_builder_clouds.yaml.j2',
'playbooks/templates/clouds/nodepool_launcher_clouds.yaml.j2',
'playbooks/templates/clouds/nodepool_clouds.yaml.j2',
'playbooks/templates/clouds/bridge_all_clouds.yaml.j2',
'playbooks/templates/clouds/bridge_clouds.yaml.j2',
)