opendev/system-config
Code Issues Proposed changes

Merge "Clean up infracloud clouds.yaml to actually work"

Browse Source
This commit is contained in:
Jenkins 2016-02-23 20:15:55 +00:00 committed by Gerrit Code Review
commit 33a58d1198
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,8 +52,8 @@ clouds:
username: '<%= infracloud_username %>' username: '<%= infracloud_username %>'
password: '<%= infracloud_password %>' password: '<%= infracloud_password %>'
project_name: '<%= infracloud_project %>' project_name: '<%= infracloud_project %>'
user_domain_id: 'default' user_domain_name: 'infra'
project_domain_id: 'default' project_domain_name: 'infra'
auth_url: 'https://controller00.hpuswest.ic.openstack.org:35357/v3' auth_url: 'https://controller00.hpuswest.ic.openstack.org:35357/v3'
auth_type: 'v3password' auth_type: 'v3password'
cacert: '/etc/openstack/infracloud_west_cacert.pem' cacert: '/etc/openstack/infracloud_west_cacert.pem'

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

@ -84,12 +84,12 @@ clouds:
username: <%= @puppetmaster_clouds['openstackjenkins_infracloud_username'] %> username: <%= @puppetmaster_clouds['openstackjenkins_infracloud_username'] %>
password: <%= @puppetmaster_clouds['openstackjenkins_infracloud_password'] %> password: <%= @puppetmaster_clouds['openstackjenkins_infracloud_password'] %>
project_name: <%= @puppetmaster_clouds['openstackjenkins_infracloud_project_name'] %> project_name: <%= @puppetmaster_clouds['openstackjenkins_infracloud_project_name'] %>
cacert: '/etc/openstack/infracloud_west_cacert.pem' project_domain_name: 'infra'
auth_type: 'v3password' user_domain_name: 'infra'
identity_api_version: '3' cacert: '/etc/openstack/infracloud_west_cacert.pem'
floating_ip_source: 'None' auth_type: 'v3password'
project_domain_id: default identity_api_version: '3'
user_domain_id: default floating_ip_source: 'None'
openstackci-infracloud-west: openstackci-infracloud-west:
region_name: RegionOne region_name: RegionOne
auth: auth:
@ -97,12 +97,12 @@ clouds:
username: <%= @puppetmaster_clouds['openstackci_infracloud_username'] %> username: <%= @puppetmaster_clouds['openstackci_infracloud_username'] %>
password: <%= @puppetmaster_clouds['openstackci_infracloud_password'] %> password: <%= @puppetmaster_clouds['openstackci_infracloud_password'] %>
project_name: <%= @puppetmaster_clouds['openstackci_infracloud_project_name'] %> project_name: <%= @puppetmaster_clouds['openstackci_infracloud_project_name'] %>
cacert: '/etc/openstack/infracloud_west_cacert.pem' project_domain_name: 'infra'
auth_type: 'v3password' user_domain_name: 'infra'
identity_api_version: '3' cacert: '/etc/openstack/infracloud_west_cacert.pem'
floating_ip_source: 'None' auth_type: 'v3password'
project_domain_id: default identity_api_version: '3'
user_domain_id: default floating_ip_source: 'None'
openstackjenkins-rax: openstackjenkins-rax:
regions: regions:
- DFW - DFW

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

@ -45,5 +45,9 @@ clouds:
username: <%= @puppetmaster_clouds['openstackci_infracloud_username'] %> username: <%= @puppetmaster_clouds['openstackci_infracloud_username'] %>
password: <%= @puppetmaster_clouds['openstackci_infracloud_password'] %> password: <%= @puppetmaster_clouds['openstackci_infracloud_password'] %>
project_name: <%= @puppetmaster_clouds['openstackci_infracloud_project_name'] %> project_name: <%= @puppetmaster_clouds['openstackci_infracloud_project_name'] %>
project_domain_id: default project_domain_name: 'infra'
user_domain_id: default user_domain_name: 'infra'
cacert: '/etc/openstack/infracloud_west_cacert.pem'
auth_type: 'v3password'
identity_api_version: '3'
floating_ip_source: 'None'