Merge "HPELeftHandISCSIDriver support for cinder"

3 files changed, 95 insertions, 8 deletions

diff --git a/manifests/profile/base/cinder/volume.pp b/manifests/profile/base/cinder/volume.pp
index 64927b6..7663b6f 100644
--- a/manifests/profile/base/cinder/volume.pp
+++ b/manifests/profile/base/cinder/volume.pp
@@ -22,6 +22,10 @@
 #   (Optional) Whether to enable the delsc backend
 #   Defaults to true
 #
+# [*cinder_enable_hpelefthand_backend*]
+#   (Optional) Whether to enable the hpelefthand backend
+#   Defaults to false
+#
 # [*cinder_enable_eqlx_backend*]
 #   (Optional) Whether to enable the eqlx backend
 #   Defaults to true
@@ -52,14 +56,15 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::cinder::volume (
-  $cinder_enable_dellsc_backend = false,
-  $cinder_enable_eqlx_backend   = false,
-  $cinder_enable_iscsi_backend  = true,
-  $cinder_enable_netapp_backend = false,
-  $cinder_enable_nfs_backend    = false,
-  $cinder_enable_rbd_backend    = false,
-  $cinder_user_enabled_backends = hiera('cinder_user_enabled_backends', undef),
-  $step                         = hiera('step'),
+  $cinder_enable_dellsc_backend      = false,
+  $cinder_enable_hpelefthand_backend = false,
+  $cinder_enable_eqlx_backend        = false,
+  $cinder_enable_iscsi_backend       = true,
+  $cinder_enable_netapp_backend      = false,
+  $cinder_enable_nfs_backend         = false,
+  $cinder_enable_rbd_backend         = false,
+  $cinder_user_enabled_backends      = hiera('cinder_user_enabled_backends', undef),
+  $step                              = hiera('step'),
 ) {
   include ::tripleo::profile::base::cinder
 
@@ -73,6 +78,13 @@ class tripleo::profile::base::cinder::volume (
       $cinder_dellsc_backend_name = undef
     }
 
+    if $cinder_enable_hpelefthand_backend {
+      include ::tripleo::profile::base::cinder::volume::hpelefthand
+      $cinder_hpelefthand_backend_name = hiera('cinder::backend::hpelefthand_iscsi::volume_backend_name', 'tripleo_hpelefthand')
+    } else {
+      $cinder_hpelefthand_backend_name = undef
+    }
+
     if $cinder_enable_eqlx_backend {
       include ::tripleo::profile::base::cinder::volume::eqlx
       $cinder_eqlx_backend_name = hiera('cinder::backend::eqlx::volume_backend_name', 'tripleo_eqlx')
@@ -112,6 +124,7 @@ class tripleo::profile::base::cinder::volume (
                                       $cinder_rbd_backend_name,
                                       $cinder_eqlx_backend_name,
                                       $cinder_dellsc_backend_name,
+                                      $cinder_hpelefthand_backend_name,
                                       $cinder_netapp_backend_name,
                                       $cinder_nfs_backend_name,
                                       $cinder_user_enabled_backends])
diff --git a/manifests/profile/base/cinder/volume/hpelefthand.pp b/manifests/profile/base/cinder/volume/hpelefthand.pp
new file mode 100644
index 0000000..32f0976
--- /dev/null
+++ b/manifests/profile/base/cinder/volume/hpelefthand.pp
@@ -0,0 +1,71 @@
+# Copyright 2016 Hewlett-Packard Enterprise.
+#
+# 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.
+#
+# == Class: tripleo::profile::base::cinder::volume::hpelefthand
+#
+# Cinder Volume hpelefthand profile for tripleo
+#
+# === Parameters
+#
+# [*backend_name*]
+#   (Optional) Name given to the Cinder backend stanza
+#   Defaults to 'tripleo_hpelefthand'
+#
+# [*cinder_hpelefthand_api_url*]
+#   (required) url for api access to lefthand - example https://10.x.x.x:8080/api/v1
+#
+# [*cinder_hpelefthand_username*]
+#   (required) Username for HPElefthand admin user
+#
+# [*cinder_hpelefthand_password*]
+#   (required) Password for hpelefthand_username
+#
+# [*cinder_hpelefthand_iscsi_chap_enabled*]
+#   (required) setting to false by default
+#
+# [*cinder_hpelefthand_clustername*]
+#   (required) clustername of hpelefthand
+#
+# [*cinder_hpelefthand_debug*]
+#   (required) setting to false by default
+#
+# [*step*]
+#   (Optional) The current step in deployment. See tripleo-heat-templates
+#   for more details.
+#   Defaults to hiera('step')
+#
+class tripleo::profile::base::cinder::volume::hpelefthand (
+  $backend_name                          = hiera('cinder::backend::hpelefthand_iscsi::volume_backend_name', 'tripleo_hpelefthand'),
+  $cinder_hpelefthand_username           = hiera('cinder::backend::hpelefthand_iscsi::hpelefthand_username', undef),
+  $cinder_hpelefthand_password           = hiera('cinder::backend::hpelefthand_iscsi::hpelefthand_password', undef),
+  $cinder_hpelefthand_clustername        = hiera('cinder::backend::hpelefthand_iscsi::hpelefthand_clustername', undef),
+  $cinder_hpelefthand_api_url            = hiera('cinder::backend::hpelefthand_iscsi::hpelefthand_api_url', undef),
+  $cinder_hpelefthand_iscsi_chap_enabled = hiera('cinder::backend::hpelefthand_iscsi::hpelefthand_iscsi_chap_enabled', undef),
+  $cinder_hpelefthand_debug              = hiera('cinder::backend::hpelefthand_iscsi::hpelefthand_debug', undef),
+  $step                                  = hiera('step'),
+) {
+  include ::tripleo::profile::base::cinder::volume
+
+  if $step >= 4 {
+    cinder::backend::hpelefthand_iscsi { $backend_name :
+      hpelefthand_username           => $cinder_hpelefthand_username,
+      hpelefthand_password           => $cinder_hpelefthand_password,
+      hpelefthand_clustername        => $cinder_hpelefthand_clustername,
+      hpelefthand_api_url            => $cinder_hpelefthand_api_url,
+      hpelefthand_iscsi_chap_enabled => $cinder_hpelefthand_iscsi_chap_enabled,
+      hpelefthand_debug              => $cinder_hpelefthand_debug,
+    }
+  }
+
+}
diff --git a/releasenotes/notes/hpelefthand_8474c416b0d411e6.yaml b/releasenotes/notes/hpelefthand_8474c416b0d411e6.yaml
new file mode 100644
index 0000000..a92cbae
--- /dev/null
+++ b/releasenotes/notes/hpelefthand_8474c416b0d411e6.yaml
@@ -0,0 +1,3 @@
+---
+features:
+  - Added hpelefthand_iscsi backend support for cinder