opendev/system-config
Code Issues Proposed changes

Update admin-bluebox with new settings

Browse Source 
This is part of our effort to bring bluebox back online for nodepool.
As such, we need to update shade with the new defaults.

Change-Id: I6e8644ac1de739bf1be084e53d2e4deab1fa9100
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2016-08-09 14:19:11 -04:00
parent db1728df0a
commit ae45563ae5
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,10 +40,13 @@ clouds:
floating_ip_source: neutron floating_ip_source: neutron
bluebox-sjc1: bluebox-sjc1:
auth: auth:
auth_url: https://montytaylor-sjc.openstack.blueboxgrid.com:5000
username: '<%= @bluebox_username %>' username: '<%= @bluebox_username %>'
password: '<%= @bluebox_password %>' password: '<%= @bluebox_password %>'
project_name: '<%= @bluebox_project %>' project_name: '<%= @bluebox_project %>'
auth_url: 'https://montytaylor-sjc.openstack.blueboxgrid.com:5001/v2.0' project_domain_name: default
user_domain_name: default
identity_api_version: '3'
internap: internap:
profile: internap profile: internap
region_name: nyj01 region_name: nyj01

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

@ -2,10 +2,13 @@ clouds:
admin-bluebox: admin-bluebox:
region_name: RegionOne region_name: RegionOne
auth: auth:
auth_url: https://montytaylor-sjc.openstack.blueboxgrid.com:5001/v2.0 auth_url: https://montytaylor-sjc.openstack.blueboxgrid.com:5000
username: <%= @puppetmaster_clouds['admin_bluebox_username'] %> username: <%= @puppetmaster_clouds['admin_bluebox_username'] %>
password: <%= @puppetmaster_clouds['admin_bluebox_password'] %> password: <%= @puppetmaster_clouds['admin_bluebox_password'] %>
project_name: <%= @puppetmaster_clouds['admin_bluebox_project_name'] %> project_name: <%= @puppetmaster_clouds['admin_bluebox_project_name'] %>
project_domain_name: default
user_domain_name: default
identity_api_version: '3'
infra-files-ro: infra-files-ro:
profile: rackspace profile: rackspace
auth: auth:
@ -23,10 +26,13 @@ clouds:
openstackci-bluebox: openstackci-bluebox:
region_name: RegionOne region_name: RegionOne
auth: auth:
auth_url: https://montytaylor-sjc.openstack.blueboxgrid.com:5001/v2.0 auth_url: https://montytaylor-sjc.openstack.blueboxgrid.com:5000
username: <%= @puppetmaster_clouds['openstackci_bluebox_username'] %> username: <%= @puppetmaster_clouds['openstackci_bluebox_username'] %>
password: <%= @puppetmaster_clouds['openstackci_bluebox_password'] %> password: <%= @puppetmaster_clouds['openstackci_bluebox_password'] %>
project_name: <%= @puppetmaster_clouds['openstackci_bluebox_project_name'] %> project_name: <%= @puppetmaster_clouds['openstackci_bluebox_project_name'] %>
project_domain_name: default
user_domain_name: default
identity_api_version: '3'
openstackci-internap: openstackci-internap:
region_name: nyj01 region_name: nyj01
profile: internap profile: internap
@ -69,10 +75,13 @@ clouds:
openstackjenkins-bluebox: openstackjenkins-bluebox:
region_name: RegionOne region_name: RegionOne
auth: auth:
auth_url: https://montytaylor-sjc.openstack.blueboxgrid.com:5001/v2.0 auth_url: https://montytaylor-sjc.openstack.blueboxgrid.com:5000
username: <%= @puppetmaster_clouds['openstackjenkins_bluebox_username'] %> username: <%= @puppetmaster_clouds['openstackjenkins_bluebox_username'] %>
password: <%= @puppetmaster_clouds['openstackjenkins_bluebox_password'] %> password: <%= @puppetmaster_clouds['openstackjenkins_bluebox_password'] %>
project_name: <%= @puppetmaster_clouds['openstackjenkins_bluebox_project_name'] %> project_name: <%= @puppetmaster_clouds['openstackjenkins_bluebox_project_name'] %>
project_domain_name: default
user_domain_name: default
identity_api_version: '3'
openstackjenkins-rax: openstackjenkins-rax:
regions: regions:
- DFW - DFW