opendev/system-config
Code Issues Proposed changes

Remove infracloud-chocolate from clouds.yaml

Browse Source 
Currently infracloud controllers are down, as such we no longer are
able to get dynamic inventory from it.  Remove the provider for now
and revert if possible.

Change-Id: I5d2c27de04d7036d49e183cbd3ec3063083da42e
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2018-01-23 17:10:48 -05:00
parent c5a8e22f1b
commit 1827200ac5
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
2 changed files with 0 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
View File

@ -1,27 +1,4 @@
clouds:
admin-infracloud-chocolate:
region_name: RegionOne
auth:
auth_url: https://controller00.chocolate.ic.openstack.org:5000
username: <%= @puppetmaster_clouds['admin_infracloud_chocolate_username'] %>
password: <%= @puppetmaster_clouds['admin_infracloud_chocolate_password'] %>
project_name: <%= @puppetmaster_clouds['admin_infracloud_chocolate_project_name'] %>
project_domain_name: default
user_domain_name: default
identity_api_version: '3'
cacert: /etc/openstack/infracloud_chocolate_cacert.pem
openstackci-infracloud-chocolate:
region_name: RegionOne
auth:
auth_url: https://controller00.chocolate.ic.openstack.org:5000
username: <%= @puppetmaster_clouds['openstackci_infracloud_chocolate_username'] %>
password: <%= @puppetmaster_clouds['openstackci_infracloud_chocolate_password'] %>
project_name: <%= @puppetmaster_clouds['openstackci_infracloud_chocolate_project_name'] %>
project_domain_name: default
user_domain_name: default
identity_api_version: '3'
floating_ip_source: None
cacert: /etc/openstack/infracloud_chocolate_cacert.pem
openstackci-inap:
profile: internap
auth:
@ -69,18 +46,6 @@ clouds:
username: <%= @puppetmaster_clouds['openstackci_rax_username'] %>
password: <%= @puppetmaster_clouds['openstackci_rax_password'] %>
project_id: <%= @puppetmaster_clouds['openstackci_rax_project_id'] %>
openstackzuul-infracloud-chocolate:
region_name: RegionOne
auth:
auth_url: https://controller00.chocolate.ic.openstack.org:5000
username: <%= @puppetmaster_clouds['openstackzuul_infracloud_chocolate_username'] %>
password: <%= @puppetmaster_clouds['openstackzuul_infracloud_chocolate_password'] %>
project_name: <%= @puppetmaster_clouds['openstackzuul_infracloud_chocolate_project_name'] %>
project_domain_name: default
user_domain_name: default
identity_api_version: '3'
floating_ip_source: None
cacert: /etc/openstack/infracloud_chocolate_cacert.pem
openstackjenkins-rax:
regions:
- DFW

12
modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
View File

@ -63,18 +63,6 @@ clouds:
user_domain_name: default
floating_ip_source: neutron
identity_api_version: '3'
openstackci-infracloud-chocolate:
region_name: RegionOne
auth:
auth_url: https://controller00.chocolate.ic.openstack.org:5000
username: <%= @puppetmaster_clouds['openstackci_infracloud_chocolate_username'] %>
password: <%= @puppetmaster_clouds['openstackci_infracloud_chocolate_password'] %>
project_name: <%= @puppetmaster_clouds['openstackci_infracloud_chocolate_project_name'] %>
project_domain_name: default
user_domain_name: default
identity_api_version: '3'
floating_ip_source: None
cacert: /etc/openstack/infracloud_chocolate_cacert.pem
openstackci-citycloud:
regions:
- Lon1