From 5e629cacd94188330d47113f747aa86c6a39e112 Mon Sep 17 00:00:00 2001 From: Goutham Pacha Ravi Date: Thu, 14 Feb 2019 10:00:15 -0800 Subject: [PATCH] Fix keystone opt deprecations in manila manifests Add www_authenticate_uri to manila-api manifest. Remove auth_uri from api and share manifests because puppet-manila no longer supports that option. [1] Related-Bug: #1761171 [1] https://review.openstack.org/#/c/620742/ Change-Id: I07f6dc5f8e0ae7d0c8060b17b08fd3ae836e073b --- deployment/manila/manila-api-container-puppet.yaml | 2 +- deployment/manila/manila-share-container-puppet.yaml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/deployment/manila/manila-api-container-puppet.yaml b/deployment/manila/manila-api-container-puppet.yaml index c35b467c00..2bd37cf25b 100644 --- a/deployment/manila/manila-api-container-puppet.yaml +++ b/deployment/manila/manila-api-container-puppet.yaml @@ -73,7 +73,7 @@ outputs: map_merge: - get_attr: [ManilaBase, role_data, config_settings] - manila::keystone::authtoken::password: {get_param: ManilaPassword} - manila::keystone::authtoken::auth_uri: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } + manila::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} manila::keystone::authtoken::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } manila::keystone::authtoken::project_name: 'service' manila::keystone::authtoken::user_domain_name: 'Default' diff --git a/deployment/manila/manila-share-container-puppet.yaml b/deployment/manila/manila-share-container-puppet.yaml index efe121fa05..978e10a761 100644 --- a/deployment/manila/manila-share-container-puppet.yaml +++ b/deployment/manila/manila-share-container-puppet.yaml @@ -89,7 +89,6 @@ outputs: - manila::volume::cinder::cinder_admin_tenant_name: 'service' manila::keystone::authtoken::password: {get_param: ManilaPassword} manila::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri]} - manila::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]} manila::keystone::authtoken::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } manila::keystone::authtoken::project_name: 'service' service_config_settings: