diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-09 10:20:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-09 10:20:48 +0000 |
| commit | 1f79a5b76c0ca54eb053862dc0231e59e082d968 (patch) | |
| tree | 0904e802fb669b1a21a7a35a5bb498bbd1893dac /puppet | |
| parent | f8d0229dca6a4c107d2da90452251d2f8d896e4d (diff) | |
| parent | b228d5639e6a67bd1e6e79068413ba79514976a4 (diff) | |
Merge "sahara: configure keystone_authtoken parameters"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/services/sahara-base.yaml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/puppet/services/sahara-base.yaml b/puppet/services/sahara-base.yaml index 224989be..d5131f61 100644 --- a/puppet/services/sahara-base.yaml +++ b/puppet/services/sahara-base.yaml @@ -70,12 +70,14 @@ outputs: sahara::rabbit_use_ssl: {get_param: RabbitClientUseSSL} sahara::rabbit_port: {get_param: RabbitClientPort} sahara::debug: {get_param: Debug} + # Remove admin_password when https://review.openstack.org/442619 is merged. sahara::admin_password: {get_param: SaharaPassword} - sahara::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] } - sahara::identity_uri: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } sahara::use_neutron: true sahara::plugins: {get_param: SaharaPlugins} sahara::rpc_backend: rabbit - sahara::admin_tenant_name: 'service' sahara::db::database_db_max_retries: -1 sahara::db::database_max_retries: -1 + sahara::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} + sahara::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} + sahara::keystone::authtoken::password: {get_param: SaharaPassword} + sahara::keystone::authtoken::project_name: 'service' |