From f2db5bd96a522eb724ecb01b4e85194cb9c6d4c3 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Tue, 1 Mar 2016 15:14:14 -0800
Subject: [PATCH] Use project_name not _id with OSIC
Project names are easier for humans to deal with use the project_name
key in clouds.yaml for OSIC not the project_id key.
Change-Id: I15b6424e355c711941a43e78116ffb71f6647cb7
---
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 baf4d98121..109d00ba59 100644
--- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb
@@ -52,7 +52,7 @@ clouds:
auth_url: https://172.99.101.17:5000
username: <%= osic_username %>
password: <%= osic_password %>
- project_id: <%= osic_project %>
+ project_name: <%= osic_project %>
project_domain_name: default
user_domain_name: default
identity_api_version: '3'
diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
index e800447f93..3ea60359e9 100644
--- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
@@ -118,7 +118,7 @@ clouds:
auth_url: https://172.99.101.17:5000
username: <%= @puppetmaster_clouds['openstackjenkins_osic_username'] %>
password: <%= @puppetmaster_clouds['openstackjenkins_osic_password'] %>
- project_id: <%= @puppetmaster_clouds['openstackjenkins_osic_project_id'] %>
+ project_name: <%= @puppetmaster_clouds['openstackjenkins_osic_project_name'] %>
project_domain_name: default
user_domain_name: default
identity_api_version: '3'
@@ -131,7 +131,7 @@ clouds:
auth_url: https://172.99.101.17:5000
username: <%= @puppetmaster_clouds['openstackci_osic_username'] %>
password: <%= @puppetmaster_clouds['openstackci_osic_password'] %>
- project_id: <%= @puppetmaster_clouds['openstackci_osic_project_id'] %>
+ project_name: <%= @puppetmaster_clouds['openstackci_osic_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 dc46b9a460..d60cfe703d 100644
--- a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
@@ -44,7 +44,7 @@ clouds:
auth_url: https://172.99.101.17:5000
username: <%= @puppetmaster_clouds['openstackci_osic_username'] %>
password: <%= @puppetmaster_clouds['openstackci_osic_password'] %>
- project_id: <%= @puppetmaster_clouds['openstackci_osic_project_id'] %>
+ project_name: <%= @puppetmaster_clouds['openstackci_osic_project_name'] %>
project_domain_name: default
user_domain_name: default
identity_api_version: '3'