opendev/system-config
Code Issues Proposed changes

Merge "Clean up tripleo-test-cloud-rh1 os-client-config"

Browse Source
This commit is contained in:
Jenkins 2016-08-26 18:02:03 +00:00 committed by Gerrit Code Review
commit ef262c7271
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,21 +164,22 @@ clouds:
username: <%= @puppetmaster_clouds['openstack_rax_username'] %> username: <%= @puppetmaster_clouds['openstack_rax_username'] %>
password: <%= @puppetmaster_clouds['openstack_rax_password'] %> password: <%= @puppetmaster_clouds['openstack_rax_password'] %>
project_id: <%= @puppetmaster_clouds['openstack_rax_project_id'] %> project_id: <%= @puppetmaster_clouds['openstack_rax_project_id'] %>
# TODO(pabelanger): move this to openstackci-tripleo-test-cloud-rh1 to be openstackci-tripleo-test-cloud-rh1:
# consistant with other cloud providers
openstack-nodepool-tripleo:
auth: auth:
auth_url: https://ci-overcloud.rh1.tripleo.org:13000/v2.0 auth_url: https://ci-overcloud.rh1.tripleo.org:13000
username: <%= @puppetmaster_clouds['openstack_nodepool_tripleo_username'] %> username: <%= @puppetmaster_clouds['openstackci_tripleo_test_cloud_rh1_username'] %>
password: <%= @puppetmaster_clouds['openstack_nodepool_tripleo_password'] %> password: <%= @puppetmaster_clouds['openstackci_tripleo_test_cloud_rh1_password'] %>
project_name: <%= @puppetmaster_clouds['openstack_nodepool_tripleo_project_name'] %> project_name: <%= @puppetmaster_clouds['openstackci_tripleo_test_cloud_rh1_project_name'] %>
project_domain_name: default
user_domain_name: default
floating_ip_source: neutron floating_ip_source: neutron
identity_api_version: '3'
openstackzuul-tripleo-test-cloud-rh1: openstackzuul-tripleo-test-cloud-rh1:
auth: auth:
auth_url: https://ci-overcloud.rh1.tripleo.org:13000 auth_url: https://ci-overcloud.rh1.tripleo.org:13000
username: <%= @puppetmaster_clouds['openstackzuul_tripleo_username'] %> username: <%= @puppetmaster_clouds['openstackzuul_tripleo_test_cloud_rh1_username'] %>
password: <%= @puppetmaster_clouds['openstackzuul_tripleo_password'] %> password: <%= @puppetmaster_clouds['openstackzuul_tripleo_test_cloud_rh1_password'] %>
project_name: <%= @puppetmaster_clouds['openstackzuul_tripleo_project_name'] %> project_name: <%= @puppetmaster_clouds['openstackzuul_tripleo_test_cloud_rh1_project_name'] %>
project_domain_name: default project_domain_name: default
user_domain_name: default user_domain_name: default
floating_ip_source: neutron floating_ip_source: neutron

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

@ -67,9 +67,13 @@ clouds:
region_name: regionOne region_name: regionOne
auth: auth:
auth_url: 'https://ci-overcloud.rh1.tripleo.org:13000' auth_url: 'https://ci-overcloud.rh1.tripleo.org:13000'
username: <%= @puppetmaster_clouds['openstackci_tripleo_username'] %> username: <%= @puppetmaster_clouds['openstackci_tripleo_test_cloud_rh1_username'] %>
password: <%= @puppetmaster_clouds['openstackci_tripleo_password'] %> password: <%= @puppetmaster_clouds['openstackci_tripleo_test_cloud_rh1_password'] %>
project_name: <%= @puppetmaster_clouds['openstackci_tripleo_project_name'] %> project_name: <%= @puppetmaster_clouds['openstackci_tripleo_test_cloud_rh1_project_name'] %>
project_domain_name: default
user_domain_name: default
floating_ip_source: neutron
identity_api_version: '3'
openstackci-bluebox: openstackci-bluebox:
region_name: RegionOne region_name: RegionOne
auth: auth: