opendev/system-config
Code Issues Proposed changes

Use osic-cloud1

Browse Source 
Due to the possibility for multiple OSIC clouds we need to distinguish
between them in our clouds.yaml. Do that now before it becomes a problem
later and refer to the current cloud as osic-cloud1.

Change-Id: I3f35db2911a44200f0486e71fc215d021aa7c227
This commit is contained in:
Clark Boylan 2016-03-04 15:37:49 -08:00
parent 032b0d641f
commit e2404a45a2
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,7 +46,7 @@ clouds:
username: '<%= internap_username %>' username: '<%= internap_username %>'
password: '<%= internap_password %>' password: '<%= internap_password %>'
project_name: '<%= internap_project %>' project_name: '<%= internap_project %>'
osic: osic-cloud1:
region_name: RegionOne region_name: RegionOne
auth: auth:
auth_url: https://cloud1.osic.org:5000 auth_url: https://cloud1.osic.org:5000

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

@ -112,7 +112,7 @@ clouds:
username: <%= @puppetmaster_clouds['openstack_nodepool_tripleo_username'] %> username: <%= @puppetmaster_clouds['openstack_nodepool_tripleo_username'] %>
password: <%= @puppetmaster_clouds['openstack_nodepool_tripleo_password'] %> password: <%= @puppetmaster_clouds['openstack_nodepool_tripleo_password'] %>
project_name: <%= @puppetmaster_clouds['openstack_nodepool_tripleo_project_name'] %> project_name: <%= @puppetmaster_clouds['openstack_nodepool_tripleo_project_name'] %>
openstackjenkins-osic: openstackjenkins-osic-cloud1:
region_name: RegionOne region_name: RegionOne
auth: auth:
auth_url: https://cloud1.osic.org:5000 auth_url: https://cloud1.osic.org:5000
@ -122,7 +122,7 @@ clouds:
project_domain_name: default project_domain_name: default
user_domain_name: default user_domain_name: default
identity_api_version: '3' identity_api_version: '3'
openstackci-osic: openstackci-osic-cloud1:
region_name: RegionOne region_name: RegionOne
auth: auth:
auth_url: https://cloud1.osic.org:5000 auth_url: https://cloud1.osic.org:5000

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

@ -38,7 +38,7 @@ 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'] %>
openstackci-osic: openstackci-osic-cloud1:
region_name: RegionOne region_name: RegionOne
auth: auth:
auth_url: https://cloud1.osic.org:5000 auth_url: https://cloud1.osic.org:5000