Add support for Dell EMC Isilon Manila backend

This change adds support for manila::backend::dellemc_isilon

Change-Id: I92592e4b717d4b1812ccd810ec1daaedd181c3dd
Implements: blueprint dellemc-isilon-manila
(cherry picked from commit f6c9906d51fb3268b7a7d61d53181ab5d3c0d2ec)

diff --git a/capabilities-map.yaml b/capabilities-map.yaml
index 2c91803..2610063 100644 (file)
--- a/capabilities-map.yaml
+++ b/capabilities-map.yaml
@@ -426,6 +426,13 @@ topics:
           - file: environments/manila-vmax-config.yaml
             title: Deploys Manila with VMAX driver
             description: Deploys Manila and configures VMAX as its default backend.
+      - title: Manila with Isilon
+        description: >
+          Deploys Manila and configures it with the Isilon driver.
+        environments:
+          - file: environments/manila-isilon-config.yaml
+            title: Deploys Manila with Isilon driver
+            description: Deploys Manila and configures Isilon as its default backend.
             requires:
               - overcloud-resource-registry-puppet.yaml
       - title: Glance backends

diff --git a/deployed-server/deployed-server-roles-data.yaml b/deployed-server/deployed-server-roles-data.yaml
index 3344a81..7623eda 100644 (file)
--- a/deployed-server/deployed-server-roles-data.yaml
+++ b/deployed-server/deployed-server-roles-data.yaml
@@ -82,6 +82,7 @@
     - OS::TripleO::Services::ManilaApi
     - OS::TripleO::Services::ManilaScheduler
     - OS::TripleO::Services::ManilaBackendGeneric
+    - OS::TripleO::Services::ManilaBackendIsilon
     - OS::TripleO::Services::ManilaBackendNetapp
     - OS::TripleO::Services::ManilaBackendUnity
     - OS::TripleO::Services::ManilaBackendCephFs

diff --git a/environments/contrail/roles_data_contrail.yaml b/environments/contrail/roles_data_contrail.yaml
index 4b17075..bd69716 100644 (file)
--- a/environments/contrail/roles_data_contrail.yaml
+++ b/environments/contrail/roles_data_contrail.yaml
@@ -87,6 +87,7 @@
     - OS::TripleO::Services::ManilaBackendGeneric
     - OS::TripleO::Services::ManilaBackendNetapp
     - OS::TripleO::Services::ManilaBackendUnity
+    - OS::TripleO::Services::ManilaBackendIsilon
     - OS::TripleO::Services::ManilaBackendCephFs
     - OS::TripleO::Services::ManilaBackendVNX
     - OS::TripleO::Services::ManilaBackendVMAX

diff --git a/environments/manila-isilon-config.yaml b/environments/manila-isilon-config.yaml
new file mode 100644 (file)
index 0000000..809900c
--- /dev/null
+++ b/environments/manila-isilon-config.yaml
@@ -0,0 +1,17 @@
+# This environment file enables Manila with the Isilon backend.
+resource_registry:
+  OS::TripleO::Services::ManilaApi: ../puppet/services/manila-api.yaml
+  OS::TripleO::Services::ManilaScheduler: ../puppet/services/manila-scheduler.yaml
+  # Only manila-share is pacemaker managed:
+  OS::TripleO::Services::ManilaShare: ../puppet/services/pacemaker/manila-share.yaml
+  OS::TripleO::Services::ManilaBackendIsilon: ../puppet/services/manila-backend-isilon.yaml
+
+parameter_defaults:
+  ManilaIsilonBackendName: tripleo_isilon
+  ManilaIsilonDriverHandlesShareServers: true
+  ManilaIsilonNasLogin: ''
+  ManilaIsilonNasPassword: ''
+  ManilaIsilonNasServer: ''
+  ManilaIsilonNasRootDir: ''
+  ManilaIsilonNasServerPort: 8080
+  ManilaIsilonNasServerSecure: ''

diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index bc14adb..8f4b4b4 100644 (file)
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -231,6 +231,7 @@ resource_registry:
   OS::TripleO::Services::ManilaScheduler: OS::Heat::None
   OS::TripleO::Services::ManilaShare: OS::Heat::None
   OS::TripleO::Services::ManilaBackendGeneric: OS::Heat::None
+  OS::TripleO::Services::ManilaBackendIsilon: OS::Heat::None
   OS::TripleO::Services::ManilaBackendNetapp: OS::Heat::None
   OS::TripleO::Services::ManilaBackendUnity: OS::Heat::None
   OS::TripleO::Services::ManilaBackendVMAX: OS::Heat::None

diff --git a/puppet/services/manila-backend-isilon.yaml b/puppet/services/manila-backend-isilon.yaml
new file mode 100644 (file)
index 0000000..6d8a1fb
--- /dev/null
+++ b/puppet/services/manila-backend-isilon.yaml
@@ -0,0 +1,72 @@
+heat_template_version: pike
+
+description: >
+  Openstack Manila isilon backend.
+
+parameters:
+  ManilaIsilonDriverHandlesShareServers:
+    type: string
+    default: true
+  ManilaIsilonBackendName:
+    type: string
+    default: tripleo_isilon
+  ManilaIsilonNasLogin:
+    type: string
+    default: ''
+  ManilaIsilonNasPassword:
+    type: string
+    default: ''
+  ManilaIsilonNasServer:
+    type: string
+    default: ''
+  ManilaIsilonNasRootDir:
+    type: string
+    default: ''
+  ManilaIsilonNasServerPort:
+    type: number
+    default: 8080
+  ManilaIsilonNasServerSecure:
+    type: string
+    default: ''
+  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
+  DefaultPasswords:
+    default: {}
+    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.
+
+outputs:
+  role_data:
+    description: Role data for the Manila Isilon backend.
+    value:
+      service_name: manila_backend_isilon
+      config_settings:
+        manila::backend::dellemc_isilon::title: {get_param: ManilaIsilonBackendName}
+        manila::backend::dellemc_isilon::emc_nas_login: {get_param: ManilaIsilonNasLogin}
+        manila::backend::dellemc_isilon::driver_handles_share_servers: {get_param: ManilaIsilonDriverHandlesShareServers}
+        manila::backend::dellemc_isilon::emc_nas_password: {get_param: ManilaIsilonNasPassword}
+        manila::backend::dellemc_isilon::emc_nas_server: {get_param: ManilaIsilonNasServer}
+        manila::backend::dellemc_isilon::emc_nas_root_dir: {get_param: ManilaIsilonNasRootDir}
+        manila::backend::dellemc_isilon::emc_nas_server_port: {get_param: ManilaIsilonNasServerPort}
+        manila::backend::dellemc_isilon::emc_nas_server_secure: {get_param: ManilaIsilonNasServerSecure}
+      step_config:

diff --git a/releasenotes/notes/isilon_manila_e9677898724a11e7.yaml b/releasenotes/notes/isilon_manila_e9677898724a11e7.yaml
new file mode 100644 (file)
index 0000000..8eb50b8
--- /dev/null
+++ b/releasenotes/notes/isilon_manila_e9677898724a11e7.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Add support for Dell EMC Isilon manila driver

diff --git a/roles/Controller.yaml b/roles/Controller.yaml
index 603aec9..88e4dfe 100644 (file)
--- a/roles/Controller.yaml
+++ b/roles/Controller.yaml
@@ -82,6 +82,7 @@
     - OS::TripleO::Services::ManilaApi
     - OS::TripleO::Services::ManilaBackendCephFs
     - OS::TripleO::Services::ManilaBackendGeneric
+    - OS::TripleO::Services::ManilaBackendIsilon
     - OS::TripleO::Services::ManilaBackendNetapp
     - OS::TripleO::Services::ManilaBackendUnity
     - OS::TripleO::Services::ManilaBackendVNX

diff --git a/roles/ControllerOpenstack.yaml b/roles/ControllerOpenstack.yaml
index 22ae5a9..cc49782 100644 (file)
--- a/roles/ControllerOpenstack.yaml
+++ b/roles/ControllerOpenstack.yaml
@@ -66,6 +66,7 @@
     - OS::TripleO::Services::ManilaApi
     - OS::TripleO::Services::ManilaBackendCephFs
     - OS::TripleO::Services::ManilaBackendGeneric
+    - OS::TripleO::Services::ManilaBackendIsilon
     - OS::TripleO::Services::ManilaBackendNetapp
     - OS::TripleO::Services::ManilaBackendUnity
     - OS::TripleO::Services::ManilaBackendVNX

diff --git a/roles_data.yaml b/roles_data.yaml
index d4a928c..1cdaf26 100644 (file)
--- a/roles_data.yaml
+++ b/roles_data.yaml
@@ -85,6 +85,7 @@
     - OS::TripleO::Services::ManilaApi
     - OS::TripleO::Services::ManilaBackendCephFs
     - OS::TripleO::Services::ManilaBackendGeneric
+    - OS::TripleO::Services::ManilaBackendIsilon
     - OS::TripleO::Services::ManilaBackendNetapp
     - OS::TripleO::Services::ManilaBackendUnity
     - OS::TripleO::Services::ManilaBackendVNX