diff options
| author |   Emilien Macchi <emilien@redhat.com> | 2016-08-23 16:09:03 -0400 |
|---|---|---|
| committer | Emilien Macchi <emilien@redhat.com> | 2016-08-24 22:29:45 -0400 |
| commit | b5a54bf9852ab24c8c7e0501b258b9fa26e2ad01 (patch) | |
| tree | 04016020c709d7be89db65be7ef368ed6db2305b /puppet/services/manila-api.yaml | |
| parent | a95e4c2afe614064f2ec8417f13b7b9719fc5e31 (diff) | |
Update authtoken parameters to match recent changes
Update authtoken parameters for:
- Aodh
- Ironic
- Manila
- Nova
- Ceilometer
Change-Id: Ie123b8da1a7af2e406aadca4775de9e8c4e6e1f5
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 |