diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-13 18:44:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-13 18:44:27 +0000 |
| commit | b2ba3de8233639fa1ac9258a0e409bc250f9f84f (patch) | |
| tree | 68e75fce03490496244e73f997ab678c69625828 | |
| parent | 6ebfcd56b7db0d75b9d37566ab9d90a64304bede (diff) | |
| parent | 537f789f464505c07623c578b36ad14ca4e67323 (diff) | |
Merge "ironic: switch auth_uri to uri_no_suffix"
| -rw-r--r-- | puppet/services/ironic-api.yaml | 4 |
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 |