aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Tantsur <divius.inside@gmail.com>2016-09-01 12:15:06 +0200
committerDmitry Tantsur <divius.inside@gmail.com>2016-09-01 12:18:33 +0200
commit9706ac80c644eec956d34ffc5d92cb52a7f28576 (patch)
tree26f9adca1e1002c929d993f6e1779e0f3d9a23f4
parent1c0df5b42ab17be8a8d256247c77999acb5eecc7 (diff)
Ironic: service catalog entries should not have a suffix
Our OSC plugin does not play well with it - see bug 1619229. This also matches undercloud configuration. Change-Id: I5db441d321e7628a1f3f9a5bbd75a872d0719e26 Partially-Implements: blueprint ironic-integration
-rw-r--r--puppet/services/ironic-api.yaml6
1 files changed, 3 insertions, 3 deletions
diff --git a/puppet/services/ironic-api.yaml b/puppet/services/ironic-api.yaml
index 96ba7aa1..a6838a1c 100644
--- a/puppet/services/ironic-api.yaml
+++ b/puppet/services/ironic-api.yaml
@@ -54,9 +54,9 @@ outputs:
ironic::api::port: {get_param: [EndpointMap, IronicInternal, port]}
# This is used to build links in responses
ironic::api::public_endpoint: {get_param: [EndpointMap, IronicPublic, uri_no_suffix]}
- ironic::keystone::auth::admin_url: {get_param: [EndpointMap, IronicAdmin, uri]}
- ironic::keystone::auth::internal_url: {get_param: [EndpointMap, IronicInternal, uri]}
- ironic::keystone::auth::public_url: {get_param: [EndpointMap, IronicPublic, uri]}
+ ironic::keystone::auth::admin_url: {get_param: [EndpointMap, IronicAdmin, uri_no_suffix]}
+ ironic::keystone::auth::internal_url: {get_param: [EndpointMap, IronicInternal, uri_no_suffix]}
+ ironic::keystone::auth::public_url: {get_param: [EndpointMap, IronicPublic, uri_no_suffix]}
ironic::keystone::auth::auth_name: 'ironic'
ironic::keystone::auth::password: {get_param: IronicPassword }
ironic::keystone::auth::tenant: 'service'