From f6fc0c426dbe4dbcfdf29a07d0ffc49889fda5e9 Mon Sep 17 00:00:00 2001
From: Spencer Krum <nibz@spencerkrum.com>
Date: Mon, 29 Feb 2016 16:56:28 -0800
Subject: [PATCH] Remove infracloudwest from ansible-clouds.yaml

Ansible-clouds.yaml becomes /etc/openstack/clouds.yaml on the
puppetmaster and is used forr the ansible dynamic inventory. When a
cloud there does not respond, the ansible inventory fails completely.
Remove infracloudwest from all-clouds.yaml until it comes back.

Change-Id: I34d265a60f0a97f040b6703ab74c93a8fd0063af
---
 .../manifests/puppetmaster.pp                 |  2 +-
 .../puppetmaster/all-clouds.yaml.erb          | 31 -------------------
 .../puppetmaster/ansible-clouds.yaml.erb      | 11 -------
 3 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/modules/openstack_project/manifests/puppetmaster.pp b/modules/openstack_project/manifests/puppetmaster.pp
index cce3dcddbe..605901238b 100644
--- a/modules/openstack_project/manifests/puppetmaster.pp
+++ b/modules/openstack_project/manifests/puppetmaster.pp
@@ -137,7 +137,7 @@ class openstack_project::puppetmaster (
   }
 
   file { '/etc/openstack/infracloud_west_cacert.pem':
-    ensure  => present,
+    ensure  => absent,
     owner   => 'root',
     group   => 'admin',
     mode    => '0660',
diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
index 7c8a60efcd..2b95aebc1e 100644
--- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
@@ -77,37 +77,6 @@ clouds:
       username: <%= @puppetmaster_clouds['openstackjenkins_bluebox_username'] %>
       password: <%= @puppetmaster_clouds['openstackjenkins_bluebox_password'] %>
       project_name: <%= @puppetmaster_clouds['openstackjenkins_bluebox_project_name'] %>
-  openstackjenkins-infracloud-west:
-    region_name: RegionOne
-    auth:
-      auth_url: https://controller00.hpuswest.ic.openstack.org:35357/
-      username: <%= @puppetmaster_clouds['openstackjenkins_infracloud_username'] %>
-      password: <%= @puppetmaster_clouds['openstackjenkins_infracloud_password'] %>
-      project_name: <%= @puppetmaster_clouds['openstackjenkins_infracloud_project_name'] %>
-      project_domain_name: 'infra'
-      user_domain_name: 'infra'
-    cacert: '/etc/openstack/infracloud_west_cacert.pem'
-    identity_api_version: '3'
-  openstackci-infracloud-west:
-    region_name: RegionOne
-    auth:
-      auth_url: https://controller00.hpuswest.ic.openstack.org:35357/
-      username: <%= @puppetmaster_clouds['openstackci_infracloud_username'] %>
-      password: <%= @puppetmaster_clouds['openstackci_infracloud_password'] %>
-      project_name: <%= @puppetmaster_clouds['openstackci_infracloud_project_name'] %>
-      project_domain_name: 'infra'
-      user_domain_name: 'infra'
-    cacert: '/etc/openstack/infracloud_west_cacert.pem'
-    identity_api_version: '3'
-  admin-infracloud-west:
-    region_name: RegionOne
-    auth:
-      auth_url: https://controller00.hpuswest.ic.openstack.org:35357/
-      username: <%= @puppetmaster_clouds['admin_infracloud_username'] %>
-      password: <%= @puppetmaster_clouds['admin_infracloud_password'] %>
-      project_name: <%= @puppetmaster_clouds['admin_infracloud_project_name'] %>
-    cacert: '/etc/openstack/infracloud_west_cacert.pem'
-    identity_api_version: '3'
   openstackjenkins-rax:
     regions:
     - DFW
diff --git a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
index 13badf3eb1..7ccad3c727 100644
--- a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
@@ -38,14 +38,3 @@ clouds:
       username: <%= @puppetmaster_clouds['openstackci_rax_username'] %>
       password: <%= @puppetmaster_clouds['openstackci_rax_password'] %>
       project_id: <%= @puppetmaster_clouds['openstackci_rax_project_id'] %>
-  openstackci-infracloud-west:
-    region_name: RegionOne
-    auth:
-      auth_url: https://controller00.hpuswest.ic.openstack.org:35357/
-      username: <%= @puppetmaster_clouds['openstackci_infracloud_username'] %>
-      password: <%= @puppetmaster_clouds['openstackci_infracloud_password'] %>
-      project_name: <%= @puppetmaster_clouds['openstackci_infracloud_project_name'] %>
-      project_domain_name: 'infra'
-      user_domain_name: 'infra'
-    cacert: '/etc/openstack/infracloud_west_cacert.pem'
-    identity_api_version: '3'