From b5a54bf9852ab24c8c7e0501b258b9fa26e2ad01 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 23 Aug 2016 16:09:03 -0400 Subject: Update authtoken parameters to match recent changes Update authtoken parameters for: - Aodh - Ironic - Manila - Nova - Ceilometer Change-Id: Ie123b8da1a7af2e406aadca4775de9e8c4e6e1f5 --- puppet/services/manila-api.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'puppet/services/manila-api.yaml') 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 -- cgit 1.2.3-korg