Merge "HPELeftHandISCSIDriver support for Cinder"

5 files changed, 78 insertions, 0 deletions

diff --git a/capabilities-map.yaml b/capabilities-map.yaml
index 330832e5..4aecd570 100644
--- a/capabilities-map.yaml
+++ b/capabilities-map.yaml
@@ -404,6 +404,13 @@ topics:
               via puppet
             requires:
               - overcloud-resource-registry-puppet.yaml
+          - file: environments/cinder-hpelefthand-config.yaml
+            title: Cinder HPELeftHandISCSI backend
+            description: >
+              Enables a Cinder HPELeftHandISCSI backend, configured
+              via puppet
+            requires:
+              - overcloud-resource-registry-puppet.yaml
           - file: environments/cinder-eqlx-config.yaml
             title: Cinder EQLX backend
             description: >
diff --git a/environments/cinder-hpelefthand-config.yaml b/environments/cinder-hpelefthand-config.yaml
new file mode 100644
index 00000000..90d0261e
--- /dev/null
+++ b/environments/cinder-hpelefthand-config.yaml
@@ -0,0 +1,13 @@
+# A Heat environment file which can be used to enable a
+# a Cinder  HPELeftHandISCSI backend, configured via puppet
+resource_registry:
+  OS::TripleO::Services::CinderHPELeftHandISCSI: ../puppet/services/cinder-hpelefthand-iscsi.yaml
+
+parameter_defaults:
+  CinderHPELeftHandISCSIApiUrl: ''
+  CinderHPELeftHandISCSIUserName: ''
+  CinderHPELeftHandISCSIPassword: ''
+  CinderHPELeftHandISCSIBackendName: 'tripleo_hpelefthand'
+  CinderHPELeftHandISCSIChapEnabled: false
+  CinderHPELeftHandClusterName: ''
+  CinderHPELeftHandDebug: false
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index fcc2dd2f..2936a8a3 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -231,6 +231,7 @@ resource_registry:
   OS::TripleO::Services::ContrailWebui: puppet/services/network/contrail-webui.yaml
   OS::TripleO::Services::Zaqar: OS::Heat::None
   OS::TripleO::Services::NeutronML2FujitsuCfab: OS::Heat::None
+  OS::TripleO::Services::CinderHPELeftHandISCSI: OS::Heat::None
 
 parameter_defaults:
   EnablePackageInstall: false
diff --git a/puppet/services/cinder-hpelefthand-iscsi.yaml b/puppet/services/cinder-hpelefthand-iscsi.yaml
new file mode 100644
index 00000000..f22a3aeb
--- /dev/null
+++ b/puppet/services/cinder-hpelefthand-iscsi.yaml
@@ -0,0 +1,56 @@
+heat_template_version: 2017-02-24
+
+description: >
+  Configure Cinder HPELeftHandISCSIDriver
+
+parameters:
+  # Config specific parameters, to be provided via parameter_defaults
+  CinderHPELeftHandISCSIApiUrl:
+    type: string
+  CinderHPELeftHandISCSIUserName:
+    type: string
+  CinderHPELeftHandISCSIPassword:
+    type: string
+    hidden: true
+  CinderHPELeftHandISCSIBackendName:
+    type: string
+    default: 'tripleo_hpelefthand'
+  CinderHPELeftHandISCSIChapEnabled:
+    type: boolean
+    default: false
+  CinderHPELeftHandClusterName:
+     type: string
+  CinderHPELeftHandDebug:
+    type: boolean
+    default: false
+  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
+  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 Cinder HPELeftHandISCSIDriver
+    value:
+      service_name: cinder_hpelefthand_iscsi
+      config_settings:
+        tripleo::profile::base::cinder::volume::cinder_enable_hpelefthand_backend: true
+        cinder::backend::hpelefthand_iscsi::hpelefthand_api_url: {get_param: CinderHPELeftHandISCSIApiUrl}
+        cinder::backend::hpelefthand_iscsi::hpelefthand_username: {get_param: CinderHPELeftHandISCSIUserName}
+        cinder::backend::hpelefthand_iscsi::hpelefthand_password: {get_param: CinderHPELeftHandISCSIPassword}
+        cinder::backend::hpelefthand_iscsi::volume_backend_name: {get_param: CinderHPELeftHandISCSIBackendName}
+        cinder::backend::hpelefthand_iscsi::hpelefthand_iscsi_chap_enabled: {get_param: CinderHPELeftHandISCSIChapEnabled}
+        cinder::backend::hpelefthand_iscsi::hpelefthand_clustername: {get_param: CinderHPELeftHandClusterName}
+        cinder::backend::hpelefthand_iscsi::hpelefthand_debug: {get_param: CinderHPELeftHandDebug}
+      step_config: |
+        include ::tripleo::profile::base::cinder::volume
diff --git a/roles_data.yaml b/roles_data.yaml
index 8b820665..b17e47be 100644
--- a/roles_data.yaml
+++ b/roles_data.yaml
@@ -102,6 +102,7 @@
     - OS::TripleO::Services::Zaqar
     - OS::TripleO::Services::OVNDBs
     - OS::TripleO::Services::NeutronML2FujitsuCfab
+    - OS::TripleO::Services::CinderHPELeftHandISCSI
 
 - name: Compute
   CountDefault: 1