opendev/system-config
Code Issues Proposed changes

Merge "Simplify infracloud clouds.yaml"

Browse Source
This commit is contained in:
Jenkins 2016-02-24 17:32:02 +00:00 committed by Gerrit Code Review
commit 5fbd81411d
3 changed files with 5 additions and 13 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

@ -54,8 +54,6 @@ clouds:
project_name: '<%= infracloud_project %>' project_name: '<%= infracloud_project %>'
user_domain_name: 'infra' user_domain_name: 'infra'
project_domain_name: 'infra' project_domain_name: 'infra'
auth_url: 'https://controller00.hpuswest.ic.openstack.org:35357/v3' auth_url: 'https://controller00.hpuswest.ic.openstack.org:35357/'
auth_type: 'v3password'
cacert: '/home/nodepool/.config/openstack/infracloud_west_cacert.pem' cacert: '/home/nodepool/.config/openstack/infracloud_west_cacert.pem'
identity_api_version: '3' identity_api_version: '3'
floating_ip_source: 'None'

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

@ -80,33 +80,29 @@ clouds:
openstackjenkins-infracloud-west: openstackjenkins-infracloud-west:
region_name: RegionOne region_name: RegionOne
auth: auth:
auth_url: https://controller00.hpuswest.ic.openstack.org:35357/v3 auth_url: https://controller00.hpuswest.ic.openstack.org:35357/
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'] %>
project_domain_name: 'infra' project_domain_name: 'infra'
user_domain_name: 'infra' user_domain_name: 'infra'
cacert: '/etc/openstack/infracloud_west_cacert.pem' cacert: '/etc/openstack/infracloud_west_cacert.pem'
auth_type: 'v3password'
identity_api_version: '3' identity_api_version: '3'
floating_ip_source: 'None'
openstackci-infracloud-west: openstackci-infracloud-west:
region_name: RegionOne region_name: RegionOne
auth: auth:
auth_url: https://controller00.hpuswest.ic.openstack.org:35357/v3 auth_url: https://controller00.hpuswest.ic.openstack.org:35357/
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_name: 'infra' project_domain_name: 'infra'
user_domain_name: 'infra' user_domain_name: 'infra'
cacert: '/etc/openstack/infracloud_west_cacert.pem' cacert: '/etc/openstack/infracloud_west_cacert.pem'
auth_type: 'v3password'
identity_api_version: '3' identity_api_version: '3'
floating_ip_source: 'None'
admin-infracloud-west: admin-infracloud-west:
region_name: RegionOne region_name: RegionOne
auth: auth:
auth_url: https://controller00.hpuswest.ic.openstack.org:35357/v3 auth_url: https://controller00.hpuswest.ic.openstack.org:35357/
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'] %>

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

@ -41,13 +41,11 @@ clouds:
openstackci-infracloud-west: openstackci-infracloud-west:
region_name: RegionOne region_name: RegionOne
auth: auth:
auth_url: https://controller00.hpuswest.ic.openstack.org:35357/v3 auth_url: https://controller00.hpuswest.ic.openstack.org:35357/
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_name: 'infra' project_domain_name: 'infra'
user_domain_name: 'infra' user_domain_name: 'infra'
cacert: '/etc/openstack/infracloud_west_cacert.pem' cacert: '/etc/openstack/infracloud_west_cacert.pem'
auth_type: 'v3password'
identity_api_version: '3' identity_api_version: '3'
floating_ip_source: 'None'