opendev/system-config
Code Issues Proposed changes

Remove infracloud-vanilla from clouds.yaml

Browse Source 
The controller for infracloud-vanilla is no longer working, remove
access to it from our services.

Change-Id: Ic2a44f74493d3f328398b67262ae93253714bf67
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2018-01-12 14:02:05 -05:00
parent e6881b720b
commit 5c78357e9e
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
3 changed files with 0 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/openstack_project/templates/nodepool/clouds.yaml.erb
View File

@ -71,18 +71,6 @@ clouds:
username: '<%= @vexxhost_username %>' username: '<%= @vexxhost_username %>'
password: '<%= @vexxhost_password %>' password: '<%= @vexxhost_password %>'
project_name: '<%= @vexxhost_project %>' project_name: '<%= @vexxhost_project %>'
infracloud-vanilla:
api_timeout: 60
auth:
auth_url: https://controller00.vanilla.ic.openstack.org:5000
username: '<%= @infracloud_vanilla_username %>'
password: '<%= @infracloud_vanilla_password %>'
project_name: '<%= @infracloud_vanilla_project %>'
project_domain_name: default
user_domain_name: default
identity_api_version: '3'
floating_ip_source: None
cacert: /home/nodepool/.config/openstack/infracloud_vanilla_cacert.pem
infracloud-chocolate: infracloud-chocolate:
api_timeout: 60 api_timeout: 60
auth: auth:

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

@ -1,15 +1,4 @@
clouds: clouds:
admin-infracloud-vanilla:
region_name: RegionOne
auth:
auth_url: https://controller00.vanilla.ic.openstack.org:5000
username: <%= @puppetmaster_clouds['admin_infracloud_vanilla_username'] %>
password: <%= @puppetmaster_clouds['admin_infracloud_vanilla_password'] %>
project_name: <%= @puppetmaster_clouds['admin_infracloud_vanilla_project_name'] %>
project_domain_name: default
user_domain_name: default
identity_api_version: '3'
cacert: /etc/openstack/infracloud_vanilla_cacert.pem
admin-infracloud-chocolate: admin-infracloud-chocolate:
region_name: RegionOne region_name: RegionOne
auth: auth:
@ -21,18 +10,6 @@ clouds:
user_domain_name: default user_domain_name: default
identity_api_version: '3' identity_api_version: '3'
cacert: /etc/openstack/infracloud_chocolate_cacert.pem cacert: /etc/openstack/infracloud_chocolate_cacert.pem
openstackci-infracloud-vanilla:
region_name: RegionOne
auth:
auth_url: https://controller00.vanilla.ic.openstack.org:5000
username: <%= @puppetmaster_clouds['openstackci_infracloud_vanilla_username'] %>
password: <%= @puppetmaster_clouds['openstackci_infracloud_vanilla_password'] %>
project_name: <%= @puppetmaster_clouds['openstackci_infracloud_vanilla_project_name'] %>
project_domain_name: default
user_domain_name: default
identity_api_version: '3'
floating_ip_source: None
cacert: /etc/openstack/infracloud_vanilla_cacert.pem
openstackci-infracloud-chocolate: openstackci-infracloud-chocolate:
region_name: RegionOne region_name: RegionOne
auth: auth:
@ -92,18 +69,6 @@ clouds:
username: <%= @puppetmaster_clouds['openstackci_rax_username'] %> username: <%= @puppetmaster_clouds['openstackci_rax_username'] %>
password: <%= @puppetmaster_clouds['openstackci_rax_password'] %> password: <%= @puppetmaster_clouds['openstackci_rax_password'] %>
project_id: <%= @puppetmaster_clouds['openstackci_rax_project_id'] %> project_id: <%= @puppetmaster_clouds['openstackci_rax_project_id'] %>
openstackzuul-infracloud-vanilla:
region_name: RegionOne
auth:
auth_url: https://controller00.vanilla.ic.openstack.org:5000
username: <%= @puppetmaster_clouds['openstackzuul_infracloud_vanilla_username'] %>
password: <%= @puppetmaster_clouds['openstackzuul_infracloud_vanilla_password'] %>
project_name: <%= @puppetmaster_clouds['openstackzuul_infracloud_vanilla_project_name'] %>
project_domain_name: default
user_domain_name: default
identity_api_version: '3'
floating_ip_source: None
cacert: /etc/openstack/infracloud_vanilla_cacert.pem
openstackzuul-infracloud-chocolate: openstackzuul-infracloud-chocolate:
region_name: RegionOne region_name: RegionOne
auth: auth:

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

@ -63,18 +63,6 @@ clouds:
user_domain_name: default user_domain_name: default
floating_ip_source: neutron floating_ip_source: neutron
identity_api_version: '3' identity_api_version: '3'
openstackci-infracloud-vanilla:
region_name: RegionOne
auth:
auth_url: https://controller00.vanilla.ic.openstack.org:5000
username: <%= @puppetmaster_clouds['openstackci_infracloud_vanilla_username'] %>
password: <%= @puppetmaster_clouds['openstackci_infracloud_vanilla_password'] %>
project_name: <%= @puppetmaster_clouds['openstackci_infracloud_vanilla_project_name'] %>
project_domain_name: default
user_domain_name: default
identity_api_version: '3'
floating_ip_source: None
cacert: /etc/openstack/infracloud_vanilla_cacert.pem
openstackci-infracloud-chocolate: openstackci-infracloud-chocolate:
region_name: RegionOne region_name: RegionOne
auth: auth: