From 6667567d4476b5f3bd71e6dcee9949c2b804d92c Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Fri, 26 Aug 2016 23:16:02 -0400
Subject: [PATCH] Use infracloud-vanilla on puppetmaster

We'll need to do this rename over a series of patches.  Start with
puppetmaster.o.o first.

Change-Id: Ia76a257d48a16bf4513643adce6241f4ec209b9e
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 cloud_launcher/clouds_layouts.yml             |  8 +++----
 .../puppetmaster/all-clouds.yaml.erb          | 24 +++++++++----------
 .../puppetmaster/ansible-clouds.yaml.erb      |  8 +++----
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/cloud_launcher/clouds_layouts.yml b/cloud_launcher/clouds_layouts.yml
index 4ef4dfde57..8b19d66ea0 100644
--- a/cloud_launcher/clouds_layouts.yml
+++ b/cloud_launcher/clouds_layouts.yml
@@ -77,14 +77,14 @@ clouds:
     profiles:
       - openstackci-security
 
-  # infracloud
-  - name: admin-infracloud
+  # infracloud-vanilla
+  - name: admin-infracloud-vanilla
     profiles:
       - openstackci-projects
       - openstackci-flavors
-  - name: openstackci-infracloud
+  - name: openstackci-infracloud-vanilla
     profiles:
       - openstackci-security
-  - name: openstackzuul-infracloud
+  - name: openstackzuul-infracloud-vanilla
     profiles:
       - openstackci-security
diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
index 98910ba7d3..68eee46344 100644
--- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
@@ -9,13 +9,13 @@ clouds:
       project_domain_name: default
       user_domain_name: default
     identity_api_version: '3'
-  admin-infracloud:
+  admin-infracloud-vanilla:
     region_name: RegionOne
     auth:
       auth_url: https://controller00.vanilla.ic.openstack.org:5000
-      username: <%= @puppetmaster_clouds['admin_infracloud_username'] %>
-      password: <%= @puppetmaster_clouds['admin_infracloud_password'] %>
-      project_name: <%= @puppetmaster_clouds['admin_infracloud_project_name'] %>
+      username: <%= @puppetmaster_clouds['admin_infracloud_vanilla_username'] %>
+      password: <%= @puppetmaster_clouds['admin_infracloud_vanilla_password'] %>
+      project_name: <%= @puppetmaster_clouds['admin_infracloud_vanilla_project_name'] %>
       project_domain_name: default
       user_domain_name: default
     identity_api_version: '3'
@@ -44,13 +44,13 @@ clouds:
       project_domain_name: default
       user_domain_name: default
     identity_api_version: '3'
-  openstackci-infracloud:
+  openstackci-infracloud-vanilla:
     region_name: RegionOne
     auth:
       auth_url: https://controller00.vanilla.ic.openstack.org:5000
-      username: <%= @puppetmaster_clouds['openstackci_infracloud_username'] %>
-      password: <%= @puppetmaster_clouds['openstackci_infracloud_password'] %>
-      project_name: <%= @puppetmaster_clouds['openstackci_infracloud_project_name'] %>
+      username: <%= @puppetmaster_clouds['openstackci_infracloud_vanilla_username'] %>
+      password: <%= @puppetmaster_clouds['openstackci_infracloud_vanilla_password'] %>
+      project_name: <%= @puppetmaster_clouds['openstackci_infracloud_vanilla_project_name'] %>
       project_domain_name: default
       user_domain_name: default
     identity_api_version: '3'
@@ -123,13 +123,13 @@ clouds:
       project_domain_name: default
       user_domain_name: default
     identity_api_version: '3'
-  openstackzuul-infracloud:
+  openstackzuul-infracloud-vanilla:
     region_name: RegionOne
     auth:
       auth_url: https://controller00.vanilla.ic.openstack.org:5000
-      username: <%= @puppetmaster_clouds['openstackzuul_infracloud_username'] %>
-      password: <%= @puppetmaster_clouds['openstackzuul_infracloud_password'] %>
-      project_name: <%= @puppetmaster_clouds['openstackzuul_infracloud_project_name'] %>
+      username: <%= @puppetmaster_clouds['openstackzuul_infracloud_vanilla_username'] %>
+      password: <%= @puppetmaster_clouds['openstackzuul_infracloud_vanilla_password'] %>
+      project_name: <%= @puppetmaster_clouds['openstackzuul_infracloud_vanilla_project_name'] %>
       project_domain_name: default
       user_domain_name: default
     identity_api_version: '3'
diff --git a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
index 7bd6f261af..6f7fa5bfff 100644
--- a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
@@ -84,13 +84,13 @@ clouds:
       project_domain_name: default
       user_domain_name: default
     identity_api_version: '3'
-  openstackci-infracloud:
+  openstackci-infracloud-vanilla:
     region_name: RegionOne
     auth:
       auth_url: https://controller00.vanilla.ic.openstack.org:5000
-      username: <%= @puppetmaster_clouds['openstackci_infracloud_username'] %>
-      password: <%= @puppetmaster_clouds['openstackci_infracloud_password'] %>
-      project_name: <%= @puppetmaster_clouds['openstackci_infracloud_project_name'] %>
+      username: <%= @puppetmaster_clouds['openstackci_infracloud_vanilla_username'] %>
+      password: <%= @puppetmaster_clouds['openstackci_infracloud_vanilla_password'] %>
+      project_name: <%= @puppetmaster_clouds['openstackci_infracloud_vanilla_project_name'] %>
       project_domain_name: default
       user_domain_name: default
     identity_api_version: '3'