summaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-01 16:07:02 +0000
committerGerrit Code Review <review@openstack.org>2016-09-01 16:07:02 +0000
commitc89097c20220bc2266872d7bb01cce28fa01793b (patch)
treef1f0b76bbe56b25a85c59da25cbe2f8c06501827 /puppet/services
parent685c1e7de0c5a37d6f11eeb9bceaa74b0a2e923a (diff)
parent9706ac80c644eec956d34ffc5d92cb52a7f28576 (diff)
Merge "Ironic: service catalog entries should not have a suffix"
Diffstat (limited to 'puppet/services')
-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'