summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2017-03-10 12:28:41 -0500
committerEmilien Macchi <emilien@redhat.com>2017-03-13 08:08:00 -0400
commit537f789f464505c07623c578b36ad14ca4e67323 (patch)
tree11c31862a21a07b3a9b898e526d092d81c7d8a38
parentab83e7731c78d44b05243d6242d026a97f4e170a (diff)
ironic: switch auth_uri to uri_no_suffix
Switch Ironic to use auth_uri with keystone versionless endpoint. Change-Id: Ia8061a1e08bd31425f8d4192cd45b64b9f8e1f74 Partial-implement: blueprint keystone-v3
-rw-r--r--puppet/services/ironic-api.yaml4
1 files changed, 3 insertions, 1 deletions
diff --git a/puppet/services/ironic-api.yaml b/puppet/services/ironic-api.yaml
index 7aab6f8d..e24d0de6 100644
--- a/puppet/services/ironic-api.yaml
+++ b/puppet/services/ironic-api.yaml
@@ -49,8 +49,10 @@ outputs:
- get_attr: [IronicBase, role_data, config_settings]
- ironic::api::authtoken::password: {get_param: IronicPassword}
ironic::api::authtoken::project_name: 'service'
+ ironic::api::authtoken::user_domain_name: 'Default'
+ ironic::api::authtoken::project_domain_name: 'Default'
ironic::api::authtoken::username: 'ironic'
- ironic::api::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
+ ironic::api::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
ironic::api::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
# NOTE: bind IP is found in Heat replacing the network name with the
# local node IP for the given network; replacement examples