From e2404a45a24a05de3062272f683a177875136bd5 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Fri, 4 Mar 2016 15:37:49 -0800
Subject: [PATCH] Use osic-cloud1

Due to the possibility for multiple OSIC clouds we need to distinguish
between them in our clouds.yaml. Do that now before it becomes a problem
later and refer to the current cloud as osic-cloud1.

Change-Id: I3f35db2911a44200f0486e71fc215d021aa7c227
---
 modules/openstack_project/templates/nodepool/clouds.yaml.erb  | 2 +-
 .../templates/puppetmaster/all-clouds.yaml.erb                | 4 ++--
 .../templates/puppetmaster/ansible-clouds.yaml.erb            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/openstack_project/templates/nodepool/clouds.yaml.erb b/modules/openstack_project/templates/nodepool/clouds.yaml.erb
index eb173e07d3..6f07ff883e 100644
--- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb
@@ -46,7 +46,7 @@ clouds:
       username: '<%= internap_username %>'
       password: '<%= internap_password %>'
       project_name: '<%= internap_project %>'
-  osic:
+  osic-cloud1:
     region_name: RegionOne
     auth:
       auth_url: https://cloud1.osic.org:5000
diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
index 4be45c773a..89bee60bb4 100644
--- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
@@ -112,7 +112,7 @@ clouds:
       username: <%= @puppetmaster_clouds['openstack_nodepool_tripleo_username'] %>
       password: <%= @puppetmaster_clouds['openstack_nodepool_tripleo_password'] %>
       project_name: <%= @puppetmaster_clouds['openstack_nodepool_tripleo_project_name'] %>
-  openstackjenkins-osic:
+  openstackjenkins-osic-cloud1:
     region_name: RegionOne
     auth:
       auth_url: https://cloud1.osic.org:5000
@@ -122,7 +122,7 @@ clouds:
       project_domain_name: default
       user_domain_name: default
     identity_api_version: '3'
-  openstackci-osic:
+  openstackci-osic-cloud1:
     region_name: RegionOne
     auth:
       auth_url: https://cloud1.osic.org:5000
diff --git a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
index d4283586f1..8d8acaa3e3 100644
--- a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
@@ -38,7 +38,7 @@ clouds:
       username: <%= @puppetmaster_clouds['openstackci_rax_username'] %>
       password: <%= @puppetmaster_clouds['openstackci_rax_password'] %>
       project_id: <%= @puppetmaster_clouds['openstackci_rax_project_id'] %>
-  openstackci-osic:
+  openstackci-osic-cloud1:
     region_name: RegionOne
     auth:
       auth_url: https://cloud1.osic.org:5000