diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-08-25 10:38:25 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-08-25 10:38:25 +0000 |
commit | 213099a681a2649612adc7f6df6c37d40c47a8e6 (patch) | |
tree | cab0e6b5165756bb3eccc482a2541816c1e8be3a /puppet/services/manila-api.yaml | |
parent | 2903a9e4cdb55628ecdd76557e9c7814827d04ab (diff) | |
parent | b5a54bf9852ab24c8c7e0501b258b9fa26e2ad01 (diff) |
Merge "Update authtoken parameters to match recent changes"
Diffstat (limited to 'puppet/services/manila-api.yaml')
-rw-r--r-- | puppet/services/manila-api.yaml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/puppet/services/manila-api.yaml b/puppet/services/manila-api.yaml index 8b456af5..633e75ba 100644 --- a/puppet/services/manila-api.yaml +++ b/puppet/services/manila-api.yaml @@ -43,9 +43,10 @@ outputs: config_settings: map_merge: - get_attr: [ManilaBase, role_data, config_settings] - - manila::api::keystone_password: {get_param: ManilaPassword} - manila::api::keystone_auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]} - manila::api::keystone_auth_host: {get_param: [EndpointMap, ManilaInternal, host]} + - manila::keystone::authtoken::password: {get_param: ManilaPassword} + manila::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]} + manila::keystone::authtoken::auth_url: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix] } + manila::keystone::authtoken::project_name: 'service' manila::keystone::auth::public_url: {get_param: [EndpointMap, ManilaV1Public, uri]} manila::keystone::auth::internal_url: {get_param: [EndpointMap, ManilaV1Internal, uri]} manila::keystone::auth::admin_url: {get_param: [EndpointMap, ManilaV1Admin, uri]} @@ -54,7 +55,6 @@ outputs: manila::keystone::auth::admin_url_v2: {get_param: [EndpointMap, ManilaAdmin, uri]} manila::keystone::auth::password: {get_param: ManilaPassword } manila::keystone::auth::region: {get_param: KeystoneRegion } - manila::api::keystone_tenant: 'service' step_config: | include ::tripleo::profile::base::manila::api |