opendev/system-config
Code Issues Proposed changes

Merge "Remove infracloud-chocolate from clouds.yaml"

Browse Source
This commit is contained in:
Zuul 2018-01-24 06:09:05 +00:00 committed by Gerrit Code Review
commit 57d7783470
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