opendev/system-config
Code Issues Proposed changes

Update osic-cloud1 credential format

Browse Source 
Since it is possible to run more then 1 cloud from OSIC, lets expand
our info to reference osic-cloud1.

Change-Id: I3466779f59a0075516a6f2a584f5f3a111e03826
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2016-08-17 16:36:17 -04:00
parent 61a47a7a81
commit 3a31dda904
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
4 changed files with 15 additions and 15 deletions
manifests
site.pp
modules/openstack_project/templates
nodepool
clouds.yaml.erb
puppetmaster
all-clouds.yaml.erbansible-clouds.yaml.erb

6
manifests/site.pp

@ -745,9 +745,9 @@ node 'nodepool.openstack.org' {
$infracloud_vanilla_username = hiera('nodepool_infracloud_vanilla_username', 'username')
$infracloud_vanilla_password = hiera('nodepool_infracloud_vanilla_password')
$infracloud_vanilla_project = hiera('nodepool_infracloud_vanilla_project', 'project')
$osic_username = hiera('nodepool_osic_username', 'username')
$osic_password = hiera('nodepool_osic_password')
$osic_project = hiera('nodepool_osic_project', 'project')
$osic_cloud1_username = hiera('nodepool_osic_cloud1_username', 'username')
$osic_cloud1_password = hiera('nodepool_osic_cloud1_password')
$osic_cloud1_project = hiera('nodepool_osic_cloud1_project', 'project')
$vexxhost_username = hiera('nodepool_vexxhost_username', 'username')
$vexxhost_password = hiera('nodepool_vexxhost_password')
$vexxhost_project = hiera('nodepool_vexxhost_project', 'project')

6
modules/openstack_project/templates/nodepool/clouds.yaml.erb

@ -73,9 +73,9 @@ clouds:
region_name: RegionOne
auth:
auth_url: https://cloud1.osic.org:5000
username: <%= @osic_username %>
password: <%= @osic_password %>
project_name: <%= @osic_project %>
username: <%= @osic_cloud1_username %>
password: <%= @osic_cloud1_password %>
project_name: <%= @osic_cloud1_project %>
project_domain_name: default
user_domain_name: default
networks:

12
modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb

@ -188,9 +188,9 @@ clouds:
region_name: RegionOne
auth:
auth_url: https://cloud1.osic.org:5000
username: <%= @puppetmaster_clouds['openstackjenkins_osic_username'] %>
password: <%= @puppetmaster_clouds['openstackjenkins_osic_password'] %>
project_name: <%= @puppetmaster_clouds['openstackjenkins_osic_project_name'] %>
username: <%= @puppetmaster_clouds['openstackjenkins_osic_cloud1_username'] %>
password: <%= @puppetmaster_clouds['openstackjenkins_osic_cloud1_password'] %>
project_name: <%= @puppetmaster_clouds['openstackjenkins_osic_cloud1_project_name'] %>
project_domain_name: default
user_domain_name: default
networks:
@ -206,9 +206,9 @@ clouds:
region_name: RegionOne
auth:
auth_url: https://cloud1.osic.org:5000
username: <%= @puppetmaster_clouds['openstackci_osic_username'] %>
password: <%= @puppetmaster_clouds['openstackci_osic_password'] %>
project_name: <%= @puppetmaster_clouds['openstackci_osic_project_name'] %>
username: <%= @puppetmaster_clouds['openstackci_osic_cloud1_username'] %>
password: <%= @puppetmaster_clouds['openstackci_osic_cloud1_password'] %>
project_name: <%= @puppetmaster_clouds['openstackci_osic_cloud1_project_name'] %>
project_domain_name: default
user_domain_name: default
networks:

6
modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb

@ -49,9 +49,9 @@ clouds:
region_name: RegionOne
auth:
auth_url: https://cloud1.osic.org:5000
username: <%= @puppetmaster_clouds['openstackci_osic_username'] %>
password: <%= @puppetmaster_clouds['openstackci_osic_password'] %>
project_name: <%= @puppetmaster_clouds['openstackci_osic_project_name'] %>
username: <%= @puppetmaster_clouds['openstackci_osic_cloud1_username'] %>
password: <%= @puppetmaster_clouds['openstackci_osic_cloud1_password'] %>
project_name: <%= @puppetmaster_clouds['openstackci_osic_cloud1_project_name'] %>
project_domain_name: default
user_domain_name: default
networks: