Merge "Add Pure Storage FlashBlade Manila driver"

2021-07-27 18:57:18 +00:00 · 2021-07-27 18:57:18 +00:00 · 4a55c065e3
commit 4a55c065e3
parent 0bf7fff9bf 2d92ebf07e
20 changed files with 104 additions and 0 deletions
--- a/ci/environments/scenario000-standalone.yaml
+++ b/ci/environments/scenario000-standalone.yaml
@ -86,6 +86,7 @@ resource_registry:
  OS::TripleO::Services::Logging::PlacementApi: OS::Heat::None
  OS::TripleO::Services::ManilaApi: OS::Heat::None
  OS::TripleO::Services::ManilaBackendCephFs: OS::Heat::None
+  OS::TripleO::Services::ManilaBackendFlashBlade: OS::Heat::None
  OS::TripleO::Services::ManilaBackendIsilon: OS::Heat::None
  OS::TripleO::Services::ManilaBackendNetapp: OS::Heat::None
  OS::TripleO::Services::ManilaBackendUnity: OS::Heat::None
--- a/deployment/manila/manila-backend-flashblade-puppet.yaml
+++ b/deployment/manila/manila-backend-flashblade-puppet.yaml
@ -0,0 +1,67 @@
+# Copyright (c) 2021 Pure Storage Inc, or its subsidiaries.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+heat_template_version: wallaby
+
+description: >
+  Openstack Manila Pure Storage FlashBlade backend
+
+parameters:
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  RoleName:
+    default: ''
+    description: Role name on which the service is applied
+    type: string
+  RoleParameters:
+    default: {}
+    description: Parameters specific to the role
+    type: json
+  EndpointMap:
+    default: {}
+    type: json
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+  ManilaFlashBladeBackendName:
+    type: string
+    default: 'tripleo_flashblade'
+  ManilaFlashBladeMgmtIp:
+    type: string
+  ManilaFlashBladeDataIp:
+    type: string
+  ManilaFlashBladeAPIToken:
+    type: string
+  ManilaFlashBladeEradicate:
+    type: boolean
+    default: true
+
+outputs:
+  role_data:
+    description: Role data for the Manila Pure Storage FlashBlade backend.
+    value:
+      service_name: manila_backend_flashblade
+      config_settings:
+        map_merge:
+          - manila::backend::flashblade::share_backend_name: {get_param: ManilaFlashBladeBackendName}
+            manila::backend::flashblade::flashblade_mgmt_vip: {get_param: ManilaFlashBladeMgmtIp}
+            manila::backend::flashblade::flashblade_data_vip: {get_param: ManilaFlashBladeDataIp}
+            manila::backend::flashblade::flashblade_api_token: {get_param: ManilaFlashBladeAPIToken}
+            manila::backend::flashblade::flashblade_eradicate : {get_param: ManilaFlashBladeEradicate}
--- a/environments/manila-flashblade-config.yaml
+++ b/environments/manila-flashblade-config.yaml
@ -0,0 +1,15 @@
+# A Heat environment file which can be used to enable a
+# Manila Pure Storage FlashBlade backend, configured via puppet
+resource_registry:
+  OS::TripleO::Services::ManilaApi: ../deployment/manila/manila-api-container-puppet.yaml
+  OS::TripleO::Services::ManilaScheduler: ../deployment/manila/manila-scheduler-container-puppet.yaml
+  # Only manila-share is pacemaker managed:
+  OS::TripleO::Services::ManilaShare: ../deployment/manila/manila-share-pacemaker-puppet.yaml
+  OS::TripleO::Services::ManilaBackendFlashBlade: ../deployment/manila/manila-backend-flashblade-puppet.yaml
+
+parameter_defaults:
+  ManilaFlashBladeBackendName: 'tripleo_flashblade'
+  ManilaFlashBladeMgmtIp: ''
+  ManilaFlashBladeDataIp: ''
+  ManilaFlashBladeAPIToken: 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'
+  ManilaFlashBladeEradicate: true
--- a/environments/standalone/standalone-overcloud.yaml
+++ b/environments/standalone/standalone-overcloud.yaml
@ -85,6 +85,7 @@ resource_registry:
  OS::TripleO::Services::IronicPxe: OS::Heat::None
  OS::TripleO::Services::ManilaApi: OS::Heat::None
  OS::TripleO::Services::ManilaBackendCephFs: OS::Heat::None
+  OS::TripleO::Services::ManilaBackendFlashBlade: OS::Heat::None
  OS::TripleO::Services::ManilaBackendIsilon: OS::Heat::None
  OS::TripleO::Services::ManilaBackendNetapp: OS::Heat::None
  OS::TripleO::Services::ManilaBackendUnity: OS::Heat::None
--- a/environments/standalone/standalone-tripleo.yaml
+++ b/environments/standalone/standalone-tripleo.yaml
@ -95,6 +95,7 @@ resource_registry:
  OS::TripleO::Services::IronicPxe: OS::Heat::None
  OS::TripleO::Services::ManilaApi: OS::Heat::None
  OS::TripleO::Services::ManilaBackendCephFs: OS::Heat::None
+  OS::TripleO::Services::ManilaBackendFlashBlade: OS::Heat::None
  OS::TripleO::Services::ManilaBackendIsilon: OS::Heat::None
  OS::TripleO::Services::ManilaBackendNetapp: OS::Heat::None
  OS::TripleO::Services::ManilaBackendUnity: OS::Heat::None
--- a/environments/undercloud/undercloud-minion.yaml
+++ b/environments/undercloud/undercloud-minion.yaml
@ -194,6 +194,7 @@ resource_registry:
  OS::TripleO::Services::Logging::PlacementApi: OS::Heat::None
  OS::TripleO::Services::ManilaApi: OS::Heat::None
  OS::TripleO::Services::ManilaBackendCephFs: OS::Heat::None
+  OS::TripleO::Services::ManilaBackendFlashBlade: OS::Heat::None
  OS::TripleO::Services::ManilaBackendIsilon: OS::Heat::None
  OS::TripleO::Services::ManilaBackendNetapp: OS::Heat::None
  OS::TripleO::Services::ManilaBackendUnity: OS::Heat::None
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@ -242,6 +242,7 @@ resource_registry:
  OS::TripleO::Services::ManilaApi: OS::Heat::None
  OS::TripleO::Services::ManilaScheduler: OS::Heat::None
  OS::TripleO::Services::ManilaShare: OS::Heat::None
+  OS::TripleO::Services::ManilaBackendFlashBlade: OS::Heat::None
  OS::TripleO::Services::ManilaBackendIsilon: OS::Heat::None
  OS::TripleO::Services::ManilaBackendNetapp: OS::Heat::None
  OS::TripleO::Services::ManilaBackendUnity: OS::Heat::None
--- a/releasenotes/notes/purestorage_flashblade-75cbbdae48f233e0.yaml
+++ b/releasenotes/notes/purestorage_flashblade-75cbbdae48f233e0.yaml
@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Add support for the Pure Storage FlashBlade Manila driver
--- a/roles/Controller.yaml
+++ b/roles/Controller.yaml
@ -115,6 +115,7 @@
    - OS::TripleO::Services::LoginDefs
    - OS::TripleO::Services::ManilaApi
    - OS::TripleO::Services::ManilaBackendCephFs
+    - OS::TripleO::Services::ManilaBackendFlashBlade
    - OS::TripleO::Services::ManilaBackendIsilon
    - OS::TripleO::Services::ManilaBackendNetapp
    - OS::TripleO::Services::ManilaBackendUnity
--- a/roles/ControllerAllNovaStandalone.yaml
+++ b/roles/ControllerAllNovaStandalone.yaml
@ -81,6 +81,7 @@
    - OS::TripleO::Services::LoginDefs
    - OS::TripleO::Services::ManilaApi
    - OS::TripleO::Services::ManilaBackendCephFs
+    - OS::TripleO::Services::ManilaBackendFlashBlade
    - OS::TripleO::Services::ManilaBackendIsilon
    - OS::TripleO::Services::ManilaBackendNetapp
    - OS::TripleO::Services::ManilaBackendUnity
--- a/roles/ControllerNoCeph.yaml
+++ b/roles/ControllerNoCeph.yaml
@ -103,6 +103,7 @@
    - OS::TripleO::Services::LoginDefs
    - OS::TripleO::Services::ManilaApi
    - OS::TripleO::Services::ManilaBackendCephFs
+    - OS::TripleO::Services::ManilaBackendFlashBlade
    - OS::TripleO::Services::ManilaBackendIsilon
    - OS::TripleO::Services::ManilaBackendNetapp
    - OS::TripleO::Services::ManilaBackendUnity
--- a/roles/ControllerNovaStandalone.yaml
+++ b/roles/ControllerNovaStandalone.yaml
@ -87,6 +87,7 @@
    - OS::TripleO::Services::LoginDefs
    - OS::TripleO::Services::ManilaApi
    - OS::TripleO::Services::ManilaBackendCephFs
+    - OS::TripleO::Services::ManilaBackendFlashBlade
    - OS::TripleO::Services::ManilaBackendIsilon
    - OS::TripleO::Services::ManilaBackendNetapp
    - OS::TripleO::Services::ManilaBackendUnity
--- a/roles/ControllerOpenstack.yaml
+++ b/roles/ControllerOpenstack.yaml
@ -86,6 +86,7 @@
    - OS::TripleO::Services::LoginDefs
    - OS::TripleO::Services::ManilaApi
    - OS::TripleO::Services::ManilaBackendCephFs
+    - OS::TripleO::Services::ManilaBackendFlashBlade
    - OS::TripleO::Services::ManilaBackendIsilon
    - OS::TripleO::Services::ManilaBackendNetapp
    - OS::TripleO::Services::ManilaBackendUnity
--- a/roles/ControllerSriov.yaml
+++ b/roles/ControllerSriov.yaml
@ -108,6 +108,7 @@
    - OS::TripleO::Services::LoginDefs
    - OS::TripleO::Services::ManilaApi
    - OS::TripleO::Services::ManilaBackendCephFs
+    - OS::TripleO::Services::ManilaBackendFlashBlade
    - OS::TripleO::Services::ManilaBackendIsilon
    - OS::TripleO::Services::ManilaBackendNetapp
    - OS::TripleO::Services::ManilaBackendUnity
--- a/roles/ControllerStorageDashboard.yaml
+++ b/roles/ControllerStorageDashboard.yaml
@ -113,6 +113,7 @@
    - OS::TripleO::Services::LoginDefs
    - OS::TripleO::Services::ManilaApi
    - OS::TripleO::Services::ManilaBackendCephFs
+    - OS::TripleO::Services::ManilaBackendFlashBlade
    - OS::TripleO::Services::ManilaBackendIsilon
    - OS::TripleO::Services::ManilaBackendNetapp
    - OS::TripleO::Services::ManilaBackendUnity
--- a/roles/ControllerStorageNfs.yaml
+++ b/roles/ControllerStorageNfs.yaml
@ -114,6 +114,7 @@
    - OS::TripleO::Services::LoginDefs
    - OS::TripleO::Services::ManilaApi
    - OS::TripleO::Services::ManilaBackendCephFs
+    - OS::TripleO::Services::ManilaBackendFlashBlade
    - OS::TripleO::Services::ManilaBackendIsilon
    - OS::TripleO::Services::ManilaBackendNetapp
    - OS::TripleO::Services::ManilaBackendUnity
--- a/roles/Standalone.yaml
+++ b/roles/Standalone.yaml
@ -111,6 +111,7 @@
    - OS::TripleO::Services::LoginDefs
    - OS::TripleO::Services::ManilaApi
    - OS::TripleO::Services::ManilaBackendCephFs
+    - OS::TripleO::Services::ManilaBackendFlashBlade
    - OS::TripleO::Services::ManilaBackendIsilon
    - OS::TripleO::Services::ManilaBackendNetapp
    - OS::TripleO::Services::ManilaBackendUnity
--- a/roles_data.yaml
+++ b/roles_data.yaml
@ -118,6 +118,7 @@
    - OS::TripleO::Services::LoginDefs
    - OS::TripleO::Services::ManilaApi
    - OS::TripleO::Services::ManilaBackendCephFs
+    - OS::TripleO::Services::ManilaBackendFlashBlade
    - OS::TripleO::Services::ManilaBackendIsilon
    - OS::TripleO::Services::ManilaBackendNetapp
    - OS::TripleO::Services::ManilaBackendUnity
--- a/sample-env-generator/standalone.yaml
+++ b/sample-env-generator/standalone.yaml
@ -115,6 +115,7 @@ environments:
      # Manila
      OS::TripleO::Services::ManilaApi: OS::Heat::None
      OS::TripleO::Services::ManilaBackendCephFs: OS::Heat::None
+      OS::TripleO::Services::ManilaBackendFlashBlade: OS::Heat::None
      OS::TripleO::Services::ManilaBackendIsilon: OS::Heat::None
      OS::TripleO::Services::ManilaBackendNetapp: OS::Heat::None
      OS::TripleO::Services::ManilaBackendUnity: OS::Heat::None
@ -225,6 +226,7 @@ environments:
      # Manila
      OS::TripleO::Services::ManilaApi: OS::Heat::None
      OS::TripleO::Services::ManilaBackendCephFs: OS::Heat::None
+      OS::TripleO::Services::ManilaBackendFlashBlade: OS::Heat::None
      OS::TripleO::Services::ManilaBackendIsilon: OS::Heat::None
      OS::TripleO::Services::ManilaBackendNetapp: OS::Heat::None
      OS::TripleO::Services::ManilaBackendUnity: OS::Heat::None
--- a/sample-env-generator/undercloud-minion.yaml
+++ b/sample-env-generator/undercloud-minion.yaml
@ -180,6 +180,7 @@ environments:
      OS::TripleO::Services::Logging::PlacementApi: OS::Heat::None
      OS::TripleO::Services::ManilaApi: OS::Heat::None
      OS::TripleO::Services::ManilaBackendCephFs: OS::Heat::None
+      OS::TripleO::Services::ManilaBackendFlashBlade: OS::Heat::None
      OS::TripleO::Services::ManilaBackendIsilon: OS::Heat::None
      OS::TripleO::Services::ManilaBackendNetapp: OS::Heat::None
      OS::TripleO::Services::ManilaBackendUnity: OS::Heat::None