From ebec31f5721eaecb27a9de01298e878ee1b66189 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Mon, 1 Aug 2016 13:49:23 -0400 Subject: [PATCH] Remove openstackci-tripleo-test-cloud-rh2 from ansible-clouds Because openstackci-tripleo-test-cloud-rh2 is using a single tennat, puppetmaster is now trying to connect into nodepool slaves. So, remove openstackci-tripleo-test-cloud-rh2 until it has been migrated into a 2 tenant setup. Change-Id: I6c6f21fdb4360d244feaa25238945c7e71562ad1 Signed-off-by: Paul Belanger --- .../templates/puppetmaster/ansible-clouds.yaml.erb | 7 ------- 1 file changed, 7 deletions(-) diff --git a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb index d02957ae4f..1c5c38668b 100644 --- a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb @@ -61,10 +61,3 @@ clouds: username: <%= @puppetmaster_clouds['openstackci_tripleo_username'] %> password: <%= @puppetmaster_clouds['openstackci_tripleo_password'] %> project_name: <%= @puppetmaster_clouds['openstackci_tripleo_project_name'] %> - openstackci-tripleo-test-cloud-rh2: - region_name: regionOne - auth: - auth_url: 'https://ci-overcloud.rh2.tripleo.org:13000' - username: <%= @puppetmaster_clouds['openstackci_tripleo_username'] %> - password: <%= @puppetmaster_clouds['openstackci_tripleo_password'] %> - project_name: <%= @puppetmaster_clouds['openstackci_tripleo_project_name'] %>