opendev/system-config
Code Issues Proposed changes

Use infracloud-vanilla on puppetmaster

Browse Source 
We'll need to do this rename over a series of patches.  Start with
puppetmaster.o.o first.

Change-Id: Ia76a257d48a16bf4513643adce6241f4ec209b9e
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2016-08-26 23:16:02 -04:00
parent ef11d2f690
commit 6667567d44
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cloud_launcher/clouds_layouts.yml
View File

@ -77,14 +77,14 @@ clouds:
profiles: profiles:
- openstackci-security - openstackci-security
# infracloud # infracloud-vanilla
- name: admin-infracloud - name: admin-infracloud-vanilla
profiles: profiles:
- openstackci-projects - openstackci-projects
- openstackci-flavors - openstackci-flavors
- name: openstackci-infracloud - name: openstackci-infracloud-vanilla
profiles: profiles:
- openstackci-security - openstackci-security
- name: openstackzuul-infracloud - name: openstackzuul-infracloud-vanilla
profiles: profiles:
- openstackci-security - openstackci-security

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

@ -9,13 +9,13 @@ 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'
admin-infracloud: admin-infracloud-vanilla:
region_name: RegionOne region_name: RegionOne
auth: auth:
auth_url: https://controller00.vanilla.ic.openstack.org:5000 auth_url: https://controller00.vanilla.ic.openstack.org:5000
username: <%= @puppetmaster_clouds['admin_infracloud_username'] %> username: <%= @puppetmaster_clouds['admin_infracloud_vanilla_username'] %>
password: <%= @puppetmaster_clouds['admin_infracloud_password'] %> password: <%= @puppetmaster_clouds['admin_infracloud_vanilla_password'] %>
project_name: <%= @puppetmaster_clouds['admin_infracloud_project_name'] %> project_name: <%= @puppetmaster_clouds['admin_infracloud_vanilla_project_name'] %>
project_domain_name: default project_domain_name: default
user_domain_name: default user_domain_name: default
identity_api_version: '3' identity_api_version: '3'
@ -44,13 +44,13 @@ 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-infracloud: openstackci-infracloud-vanilla:
region_name: RegionOne region_name: RegionOne
auth: auth:
auth_url: https://controller00.vanilla.ic.openstack.org:5000 auth_url: https://controller00.vanilla.ic.openstack.org:5000
username: <%= @puppetmaster_clouds['openstackci_infracloud_username'] %> username: <%= @puppetmaster_clouds['openstackci_infracloud_vanilla_username'] %>
password: <%= @puppetmaster_clouds['openstackci_infracloud_password'] %> password: <%= @puppetmaster_clouds['openstackci_infracloud_vanilla_password'] %>
project_name: <%= @puppetmaster_clouds['openstackci_infracloud_project_name'] %> project_name: <%= @puppetmaster_clouds['openstackci_infracloud_vanilla_project_name'] %>
project_domain_name: default project_domain_name: default
user_domain_name: default user_domain_name: default
identity_api_version: '3' identity_api_version: '3'
@ -123,13 +123,13 @@ 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'
openstackzuul-infracloud: openstackzuul-infracloud-vanilla:
region_name: RegionOne region_name: RegionOne
auth: auth:
auth_url: https://controller00.vanilla.ic.openstack.org:5000 auth_url: https://controller00.vanilla.ic.openstack.org:5000
username: <%= @puppetmaster_clouds['openstackzuul_infracloud_username'] %> username: <%= @puppetmaster_clouds['openstackzuul_infracloud_vanilla_username'] %>
password: <%= @puppetmaster_clouds['openstackzuul_infracloud_password'] %> password: <%= @puppetmaster_clouds['openstackzuul_infracloud_vanilla_password'] %>
project_name: <%= @puppetmaster_clouds['openstackzuul_infracloud_project_name'] %> project_name: <%= @puppetmaster_clouds['openstackzuul_infracloud_vanilla_project_name'] %>
project_domain_name: default project_domain_name: default
user_domain_name: default user_domain_name: default
identity_api_version: '3' identity_api_version: '3'

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

@ -84,13 +84,13 @@ 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-infracloud: openstackci-infracloud-vanilla:
region_name: RegionOne region_name: RegionOne
auth: auth:
auth_url: https://controller00.vanilla.ic.openstack.org:5000 auth_url: https://controller00.vanilla.ic.openstack.org:5000
username: <%= @puppetmaster_clouds['openstackci_infracloud_username'] %> username: <%= @puppetmaster_clouds['openstackci_infracloud_vanilla_username'] %>
password: <%= @puppetmaster_clouds['openstackci_infracloud_password'] %> password: <%= @puppetmaster_clouds['openstackci_infracloud_vanilla_password'] %>
project_name: <%= @puppetmaster_clouds['openstackci_infracloud_project_name'] %> project_name: <%= @puppetmaster_clouds['openstackci_infracloud_vanilla_project_name'] %>
project_domain_name: default project_domain_name: default
user_domain_name: default user_domain_name: default
identity_api_version: '3' identity_api_version: '3'