Merge "Add support for Dell EMC XtremIO Cinder ISCSI Backend"

2018-03-16 01:18:44 +00:00 · 2018-03-16 01:18:44 +00:00 · 0da17202ec
parent fbb6af9bc2 a462d796a7
commit 0da17202ec
11 changed files with 126 additions and 0 deletions
--- a/capabilities-map.yaml
+++ b/capabilities-map.yaml
@ -354,6 +354,13 @@ topics:
              configured via puppet
            requires:
              - overcloud-resource-registry-puppet.yaml
+          - file: environments/cinder-dellemc-xtremio-iscsi-config.yaml
+            title: Cinder Dell EMC XTREMIO Iscsi backend
+            description: >
+              Enables a Cinder Dell EMC XTREMIO Iscsi backend,
+              configured via puppet
+            requires:
+              - overcloud-resource-registry-puppet.yaml
          - file: environments/cinder-hpelefthand-config.yaml
            title: Cinder HPELeftHandISCSI backend
            description: >
--- a/deployed-server/deployed-server-roles-data.yaml
+++ b/deployed-server/deployed-server-roles-data.yaml
@ -57,6 +57,7 @@
    - OS::TripleO::Services::CinderBackendDellEMCUnity
    - OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI
    - OS::TripleO::Services::CinderBackendDellEMCVNX
+    - OS::TripleO::Services::CinderBackendDellEMCXTREMIOISCSI
    - OS::TripleO::Services::CinderBackendNetApp
    - OS::TripleO::Services::CinderBackendScaleIO
    - OS::TripleO::Services::CinderBackendVRTSHyperScale
--- a/environments/cinder-dellemc-xtremio-config.yaml
+++ b/environments/cinder-dellemc-xtremio-config.yaml
@ -0,0 +1,15 @@
+# A Heat environment file which can be used to enable a
+# Cinder Dell EMC XTREMIOIscsi backend, configured via puppet
+resource_registry:
+  OS::TripleO::Services::CinderBackendDellEMCXTREMIOIscsi: ../puppet/services/cinder-backend-dellemc-xtremio-iscsi.yaml
+
+parameter_defaults:
+  CinderEnableDellEMCXTREMIOIscsiBackend: true
+  CinderDellEMCXTREMIOIscsiBackendName: 'tripleo_dellemc_xtremio_iscsi'
+  CinderDellEMCXTREMIOIscsiSanIp: ''
+  CinderDellEMCXTREMIOIscsiSanLogin: 'admin'
+  CinderDellEMCXTREMIOIscsiSanPassword: ''
+  CinderDellEMCXTREMIOIscsiClusterName: 'Cluster-Name'
+  CinderDellEMCXTREMIOIscsiArrayBusyRetryCount: 5
+  CinderDellEMCXTREMIOIscsiArrayBusyRetryInterval: 5
+  CinderDellEMCXTREMIOIscsiVolumesPerGlanceCache: 100
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@ -300,6 +300,7 @@ resource_registry:
  OS::TripleO::Services::CinderBackendDellEMCUnity: OS::Heat::None
  OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI: OS::Heat::None
  OS::TripleO::Services::CinderBackendDellEMCVNX: OS::Heat::None
+  OS::TripleO::Services::CinderBackendDellEMCXTREMIOISCSI: OS::Heat::None
  OS::TripleO::Services::CinderBackendNetApp: OS::Heat::None
  OS::TripleO::Services::CinderBackendScaleIO: OS::Heat::None
  OS::TripleO::Services::CinderBackendVRTSHyperScale: OS::Heat::None
--- a/puppet/services/cinder-backend-dellemc-xtremio-iscsi.yaml
+++ b/puppet/services/cinder-backend-dellemc-xtremio-iscsi.yaml
@ -0,0 +1,93 @@
+# Copyright (c) 2016-2018 Dell 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: queens
+
+description: >
+  Openstack Cinder Dell EMC XTREMIO Iscsi backend
+
+parameters:
+  CinderEnableDellEMCXTREMIOIscsiBackend:
+    type: boolean
+    default: true
+  CinderDellEMCXTREMIOIscsiBackendName:
+    type: string
+    default: tripleo_dellemc_xtremio_iscsi
+  CinderDellEMCXTREMIOIscsiSanIp:
+    type: string
+  CinderDellEMCXTREMIOIscsiSanLogin:
+    type: string
+    default: admin
+  CinderDellEMCXTREMIOIscsiSanPassword:
+    type: string
+    hidden: true
+  CinderDellEMCXTREMIOIscsiClusterName:
+    type: string
+  CinderDellEMCXTREMIOIscsiArrayBusyRetryCount:
+    type: number
+    default: 5
+  CinderDellEMCXTREMIOIscsiArrayBusyRetryInterval:
+    type: number
+    default: 5
+  CinderDellEMCXTREMIOIscsiVolumesPerGlanceCache:
+    type: number
+    default: 100
+    description: Number of volumes created from each cached glance image.
+                 This is for image service optimisation. Limit the number
+                 of copies (XtremIO snapshots) taken from each image cache.
+                 A value of 0 ignores the limit and defers to the array
+                 maximum as the effective limit.
+  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 Cinder Dell EMC XTREMIO Iscsi backend.
+    value:
+      service_name: cinder_backend_dellemc_xtremio_iscsi
+      config_settings:
+                tripleo::profile::base::cinder::volume::cinder_enable_dellemc_xtremio_iscsi_backend: {get_param: CinderEnableDellEMCXTREMIOIscsiBackend}
+                cinder::backend::dellemc_xtremio_iscsi::volume_backend_name: {get_param: CinderDellEMCXTREMIOIscsiBackendName}
+                cinder::backend::dellemc_xtremio_iscsi::san_ip: {get_param: CinderDellEMCXTREMIOIscsiSanIp}
+                cinder::backend::dellemc_xtremio_iscsi::san_login: {get_param: CinderDellEMCXTREMIOIscsiSanLogin}
+                cinder::backend::dellemc_xtremio_iscsi::san_password: {get_param: CinderDellEMCXTREMIOIscsiSanPassword}
+                cinder::backend::dellemc_xtremio_iscsi::xtremio_cluster_name: {get_param: CinderDellEMCXTREMIOIscsiClusterName}
+                cinder::backend::dellemc_xtremio_iscsi::xtremio_array_busy_retry_count: {get_param: CinderDellEMCXTREMIOIscsiArrayBusyRetryCount}
+                cinder::backend::dellemc_xtremio_iscsi::xtremio_array_busy_retry_interval: {get_param: CinderDellEMCXTREMIOIscsiArrayBusyRetryInterval}
+                cinder::backend::dellemc_xtremio_iscsi::xtremio_volumes_per_glance_cache: {get_param: CinderDellEMCXTREMIOIscsiVolumesPerGlanceCache}
+      step_config: |
+        include ::tripleo::profile::base::cinder::volume
--- a/releasenotes/notes/xtremio_cinder_c5572898724a11e7.yaml
+++ b/releasenotes/notes/xtremio_cinder_c5572898724a11e7.yaml
@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Add support for Dell EMC XTREMIO ISCSI cinder driver
--- a/roles/Controller.yaml
+++ b/roles/Controller.yaml
@ -57,6 +57,7 @@
    - OS::TripleO::Services::CinderBackendDellEMCUnity
    - OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI
    - OS::TripleO::Services::CinderBackendDellEMCVNX
+    - OS::TripleO::Services::CinderBackendDellEMCXTREMIOISCSI
    - OS::TripleO::Services::CinderBackendNetApp
    - OS::TripleO::Services::CinderBackendScaleIO
    - OS::TripleO::Services::CinderBackendVRTSHyperScale
--- a/roles/ControllerNoCeph.yaml
+++ b/roles/ControllerNoCeph.yaml
@ -50,6 +50,7 @@
    - OS::TripleO::Services::CinderBackendDellEMCUnity
    - OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI
    - OS::TripleO::Services::CinderBackendDellEMCVNX
+    - OS::TripleO::Services::CinderBackendDellEMCXTREMIOISCSI
    - OS::TripleO::Services::CinderBackendNetApp
    - OS::TripleO::Services::CinderBackendScaleIO
    - OS::TripleO::Services::CinderBackendVRTSHyperScale
--- a/roles/ControllerNovaStandalone.yaml
+++ b/roles/ControllerNovaStandalone.yaml
@ -43,6 +43,7 @@
    - OS::TripleO::Services::CinderBackendDellEMCUnity
    - OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI
    - OS::TripleO::Services::CinderBackendDellEMCVNX
+    - OS::TripleO::Services::CinderBackendDellEMCXTREMIOISCSI
    - OS::TripleO::Services::CinderBackendNetApp
    - OS::TripleO::Services::CinderBackendScaleIO
    - OS::TripleO::Services::CinderBackendVRTSHyperScale
--- a/roles/ControllerStorageNfs.yaml
+++ b/roles/ControllerStorageNfs.yaml
@ -51,6 +51,7 @@
    - OS::TripleO::Services::CinderBackendDellSc
    - OS::TripleO::Services::CinderBackendDellEMCUnity
    - OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI
+    - OS::TripleO::Services::CinderBackendDellEMCXTREMIOISCSI
    - OS::TripleO::Services::CinderBackendNetApp
    - OS::TripleO::Services::CinderBackendScaleIO
    - OS::TripleO::Services::CinderBackendVRTSHyperScale
--- a/roles_data.yaml
+++ b/roles_data.yaml
@ -60,6 +60,7 @@
    - OS::TripleO::Services::CinderBackendDellEMCUnity
    - OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI
    - OS::TripleO::Services::CinderBackendDellEMCVNX
+    - OS::TripleO::Services::CinderBackendDellEMCXTREMIOISCSI
    - OS::TripleO::Services::CinderBackendNetApp
    - OS::TripleO::Services::CinderBackendScaleIO
    - OS::TripleO::Services::CinderBackendVRTSHyperScale