From 7b7687315042ce733a052f32e2ec6c49009cfb17 Mon Sep 17 00:00:00 2001 From: Goutham Pacha Ravi Date: Mon, 5 Oct 2020 22:30:05 -0700 Subject: [PATCH] [manila] Add "ManilaEnabledShareProtocols" param Manila's API service has a configuration option to control what NAS protocols are allowed for user shared file systems. Storage backends in manila can advertise a number of possible NAS protocols. Deployers need to be able to limit the protocols enabled on their deployments, or specify an override when enabling custom backends. Change-Id: I877063dd3ab9369b09c84136a58f5565aa3f7720 Closes-Bug: #1831767 Depends-On: I7b36e5c45b029f070976e58335d79678752a990c Signed-off-by: Goutham Pacha Ravi Co-Authored-By: Alan Bishop (cherry picked from commit 143dd289e91fb71a0311d5c3685f1ac6cfedb7fe) (cherry picked from commit bb866621a9ab67cc3d043070169f631714872da5) --- deployment/manila/manila-api-container-puppet.yaml | 7 +++++++ ...onfiguring-manila-share-protocols-6ea6bcbbe21b25ee.yaml | 7 +++++++ 2 files changed, 14 insertions(+) create mode 100644 releasenotes/notes/bug-1831767-allow-configuring-manila-share-protocols-6ea6bcbbe21b25ee.yaml diff --git a/deployment/manila/manila-api-container-puppet.yaml b/deployment/manila/manila-api-container-puppet.yaml index 392d5c38e2..a99cadd308 100644 --- a/deployment/manila/manila-api-container-puppet.yaml +++ b/deployment/manila/manila-api-container-puppet.yaml @@ -64,6 +64,12 @@ parameters: MonitoringSubscriptionManilaApi: default: 'overcloud-manila-api' type: string + ManilaEnabledShareProtocols: + default: '' + description: List of protocols to be allowed for share creation in manila. + When not set, the list is inferred via the storage back end/s + enabled. + type: comma_delimited_list conditions: @@ -164,6 +170,7 @@ outputs: manila::api::service_name: 'httpd' manila::api::enable_proxy_headers_parsing: true manila::api::default_share_type: 'default' + manila_enabled_share_protocols: {get_param: ManilaEnabledShareProtocols} - manila::wsgi::apache::servername: str_replace: template: diff --git a/releasenotes/notes/bug-1831767-allow-configuring-manila-share-protocols-6ea6bcbbe21b25ee.yaml b/releasenotes/notes/bug-1831767-allow-configuring-manila-share-protocols-6ea6bcbbe21b25ee.yaml new file mode 100644 index 0000000000..db5d0cca6f --- /dev/null +++ b/releasenotes/notes/bug-1831767-allow-configuring-manila-share-protocols-6ea6bcbbe21b25ee.yaml @@ -0,0 +1,7 @@ +--- +fixes: + - | + When using the Shared File Systems service (manila), you may now use the + Heat template parameter "ManilaEnabledShareProtocols" to configure + the NAS protocols that users may use. If not set, the value is inferred + per the storage backends that have been enabled.