From 8a14f4509997fbb5c6ec9a0868b36e470578d484 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Thu, 25 Aug 2016 16:54:06 -0400 Subject: [PATCH] Clean up tripleo-test-cloud-rh1 os-client-config We are working to bring tripleo-test-cloud-rh2 back online, which will have different user credentials. So, make sure triple-test-cloud-rh1 has specific credentials. Change-Id: I9c6ac1a49d54077173540b9b800e123f3e9d93d7 Signed-off-by: Paul Belanger --- .../puppetmaster/all-clouds.yaml.erb | 21 ++++++++++--------- .../puppetmaster/ansible-clouds.yaml.erb | 10 ++++++--- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb index b9fbd3cc52..4d1c8a7aba 100644 --- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb @@ -145,21 +145,22 @@ clouds: username: <%= @puppetmaster_clouds['openstack_rax_username'] %> password: <%= @puppetmaster_clouds['openstack_rax_password'] %> project_id: <%= @puppetmaster_clouds['openstack_rax_project_id'] %> - # TODO(pabelanger): move this to openstackci-tripleo-test-cloud-rh1 to be - # consistant with other cloud providers - openstack-nodepool-tripleo: + openstackci-tripleo-test-cloud-rh1: auth: - auth_url: https://ci-overcloud.rh1.tripleo.org:13000/v2.0 - username: <%= @puppetmaster_clouds['openstack_nodepool_tripleo_username'] %> - password: <%= @puppetmaster_clouds['openstack_nodepool_tripleo_password'] %> - project_name: <%= @puppetmaster_clouds['openstack_nodepool_tripleo_project_name'] %> + auth_url: https://ci-overcloud.rh1.tripleo.org:13000 + username: <%= @puppetmaster_clouds['openstackci_tripleo_test_cloud_rh1_username'] %> + password: <%= @puppetmaster_clouds['openstackci_tripleo_test_cloud_rh1_password'] %> + 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' openstackzuul-tripleo-test-cloud-rh1: auth: auth_url: https://ci-overcloud.rh1.tripleo.org:13000 - username: <%= @puppetmaster_clouds['openstackzuul_tripleo_username'] %> - password: <%= @puppetmaster_clouds['openstackzuul_tripleo_password'] %> - project_name: <%= @puppetmaster_clouds['openstackzuul_tripleo_project_name'] %> + username: <%= @puppetmaster_clouds['openstackzuul_tripleo_test_cloud_rh1_username'] %> + password: <%= @puppetmaster_clouds['openstackzuul_tripleo_test_cloud_rh1_password'] %> + project_name: <%= @puppetmaster_clouds['openstackzuul_tripleo_test_cloud_rh1_project_name'] %> project_domain_name: default user_domain_name: default floating_ip_source: neutron diff --git a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb index 3cac538ef4..8abc39d58d 100644 --- a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb @@ -60,9 +60,13 @@ clouds: region_name: regionOne auth: auth_url: 'https://ci-overcloud.rh1.tripleo.org:13000' - username: <%= @puppetmaster_clouds['openstackci_tripleo_username'] %> - password: <%= @puppetmaster_clouds['openstackci_tripleo_password'] %> - project_name: <%= @puppetmaster_clouds['openstackci_tripleo_project_name'] %> + username: <%= @puppetmaster_clouds['openstackci_tripleo_test_cloud_rh1_username'] %> + password: <%= @puppetmaster_clouds['openstackci_tripleo_test_cloud_rh1_password'] %> + 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: region_name: RegionOne auth: