summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClark Boylan <clark.boylan@gmail.com>2017-05-19 11:57:02 -0700
committerClark Boylan <clark.boylan@gmail.com>2017-05-19 11:57:02 -0700
commit188e67ff64fd51f715b30ebc6257886258b0237b (patch)
tree51be20edbdd59833706c9697002f8c10824161c6
parent6e9361a7c60155326a089697a8eed984793568b1 (diff)
Override Bluebox Keystone endpoint for v3
Bluebox keystone v3 api isn't properly discoverable which causes problems when attempting to perform actions like creating new projects. Address this by explicitly setting the endpoint location using a config override. Change-Id: I57c6a6733ee520fb074c72f0a3e15f7c45468730
Notes
Notes (review): Code-Review+2: Paul Belanger <pabelanger@redhat.com> Code-Review+2: James E. Blair <corvus@inaugust.com> Code-Review+1: Jesse Keating <omgjlk@us.ibm.com> Code-Review+2: Monty Taylor <mordred@inaugust.com> Workflow+1: Monty Taylor <mordred@inaugust.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 19 May 2017 21:29:09 +0000 Reviewed-on: https://review.openstack.org/466384 Project: openstack-infra/system-config Branch: refs/heads/master
-rw-r--r--modules/openstack_project/templates/nodepool/clouds.yaml.erb1
-rw-r--r--modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb3
-rw-r--r--modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb1
3 files changed, 5 insertions, 0 deletions
diff --git a/modules/openstack_project/templates/nodepool/clouds.yaml.erb b/modules/openstack_project/templates/nodepool/clouds.yaml.erb
index 2693151..7438ea5 100644
--- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb
@@ -51,6 +51,7 @@ clouds:
51 project_domain_name: default 51 project_domain_name: default
52 user_domain_name: default 52 user_domain_name: default
53 identity_api_version: '3' 53 identity_api_version: '3'
54 identity_endpoint_override: 'https://montytaylor-sjc.openstack.blueboxgrid.com:5000/v3'
54 internap: 55 internap:
55 profile: internap 56 profile: internap
56 auth: 57 auth:
diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
index c3a1e1a..ce70e0f 100644
--- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
@@ -9,6 +9,7 @@ clouds:
9 project_domain_name: default 9 project_domain_name: default
10 user_domain_name: default 10 user_domain_name: default
11 identity_api_version: '3' 11 identity_api_version: '3'
12 identity_endpoint_override: 'https://montytaylor-sjc.openstack.blueboxgrid.com:5000/v3'
12 admin-infracloud-vanilla: 13 admin-infracloud-vanilla:
13 region_name: RegionOne 14 region_name: RegionOne
14 auth: 15 auth:
@@ -55,6 +56,7 @@ clouds:
55 project_domain_name: default 56 project_domain_name: default
56 user_domain_name: default 57 user_domain_name: default
57 identity_api_version: '3' 58 identity_api_version: '3'
59 identity_endpoint_override: 'https://montytaylor-sjc.openstack.blueboxgrid.com:5000/v3'
58 openstackci-infracloud-vanilla: 60 openstackci-infracloud-vanilla:
59 region_name: RegionOne 61 region_name: RegionOne
60 auth: 62 auth:
@@ -147,6 +149,7 @@ clouds:
147 project_domain_name: default 149 project_domain_name: default
148 user_domain_name: default 150 user_domain_name: default
149 identity_api_version: '3' 151 identity_api_version: '3'
152 identity_endpoint_override: 'https://montytaylor-sjc.openstack.blueboxgrid.com:5000/v3'
150 openstackzuul-infracloud-vanilla: 153 openstackzuul-infracloud-vanilla:
151 region_name: RegionOne 154 region_name: RegionOne
152 auth: 155 auth:
diff --git a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
index de96ee2..5e4cfc1 100644
--- a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
@@ -113,6 +113,7 @@ clouds:
113 project_domain_name: default 113 project_domain_name: default
114 user_domain_name: default 114 user_domain_name: default
115 identity_api_version: '3' 115 identity_api_version: '3'
116 identity_endpoint_override: 'https://montytaylor-sjc.openstack.blueboxgrid.com:5000/v3'
116 openstackci-infracloud-vanilla: 117 openstackci-infracloud-vanilla:
117 region_name: RegionOne 118 region_name: RegionOne
118 auth: 119 auth: