Merge "Add new profile for the Veritas HyperScale's cinder backend."

5 files changed, 73 insertions, 7 deletions

diff --git a/manifests/profile/base/cinder/volume.pp b/manifests/profile/base/cinder/volume.pp
index 3581540..bdfdd17 100644
--- a/manifests/profile/base/cinder/volume.pp
+++ b/manifests/profile/base/cinder/volume.pp
@@ -20,11 +20,11 @@
 #
 # [*cinder_enable_pure_backend*]
 #   (Optional) Whether to enable the pure backend
-#   Defaults to true
+#   Defaults to false
 #
 # [*cinder_enable_dellsc_backend*]
 #   (Optional) Whether to enable the delsc backend
-#   Defaults to true
+#   Defaults to false
 #
 # [*cinder_enable_hpelefthand_backend*]
 #   (Optional) Whether to enable the hpelefthand backend
@@ -32,7 +32,7 @@
 #
 # [*cinder_enable_dellps_backend*]
 #   (Optional) Whether to enable the dellps backend
-#   Defaults to true
+#   Defaults to false
 #
 # [*cinder_enable_iscsi_backend*]
 #   (Optional) Whether to enable the iscsi backend
@@ -40,19 +40,23 @@
 #
 # [*cinder_enable_netapp_backend*]
 #   (Optional) Whether to enable the netapp backend
-#   Defaults to true
+#   Defaults to false
 #
 # [*cinder_enable_nfs_backend*]
 #   (Optional) Whether to enable the nfs backend
-#   Defaults to true
+#   Defaults to false
 #
 # [*cinder_enable_rbd_backend*]
 #   (Optional) Whether to enable the rbd backend
-#   Defaults to true
+#   Defaults to false
 #
 # [*cinder_enable_scaleio_backend*]
 #   (Optional) Whether to enable the scaleio backend
-#   Defaults to true
+#   Defaults to false
+#
+#[*cinder_enable_vrts_hs_backend*]
+#   (Optional) Whether to enable the Veritas HyperScale backend
+#   Defaults to false
 #
 # [*cinder_user_enabled_backends*]
 #   (Optional) List of additional backend stanzas to activate
@@ -73,6 +77,7 @@ class tripleo::profile::base::cinder::volume (
   $cinder_enable_nfs_backend         = false,
   $cinder_enable_rbd_backend         = false,
   $cinder_enable_scaleio_backend     = false,
+  $cinder_enable_vrts_hs_backend     = false,
   $cinder_user_enabled_backends      = hiera('cinder_user_enabled_backends', undef),
   $step                              = Integer(hiera('step')),
 ) {
@@ -144,6 +149,13 @@ class tripleo::profile::base::cinder::volume (
       $cinder_scaleio_backend_name = undef
     }
 
+    if $cinder_enable_vrts_hs_backend {
+      include ::tripleo::profile::base::cinder::volume::veritas_hyperscale
+      $cinder_veritas_hyperscale_backend_name = 'Veritas_HyperScale'
+    } else {
+      $cinder_veritas_hyperscale_backend_name = undef
+    }
+
     $backends = delete_undef_values([$cinder_iscsi_backend_name,
                                       $cinder_rbd_backend_name,
                                       $cinder_pure_backend_name,
@@ -153,6 +165,7 @@ class tripleo::profile::base::cinder::volume (
                                       $cinder_netapp_backend_name,
                                       $cinder_nfs_backend_name,
                                       $cinder_scaleio_backend_name,
+                                      $cinder_veritas_hyperscale_backend_name,
                                       $cinder_user_enabled_backends])
     # NOTE(aschultz): during testing it was found that puppet 3 may incorrectly
     # include a "" in the previous array which is not removed by the
diff --git a/manifests/profile/base/cinder/volume/veritas_hyperscale.pp b/manifests/profile/base/cinder/volume/veritas_hyperscale.pp
new file mode 100644
index 0000000..4516d01
--- /dev/null
+++ b/manifests/profile/base/cinder/volume/veritas_hyperscale.pp
@@ -0,0 +1,44 @@
+# Copyright (c) 2017 Veritas Technologies LLC.
+#
+# 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::veritas_hyperscale
+#
+# Cinder Volume Veritas HyperScale profile for tripleo
+#
+# === Parameters
+#
+# [*backend_name*]
+#   (Optional) The name of Veritas HyperScale cinder backend.
+#   Currently the backend name is hard-coded in the driver, and it won't
+#   function if other value is set in hiera.
+#
+# [*step*]
+#   (Optional) The current step in deployment. See tripleo-heat-templates
+#   for more details.
+#   Defaults to hiera('step')
+#
+class tripleo::profile::base::cinder::volume::veritas_hyperscale (
+  # Note: Currently the backend name is hard-coded in the driver, and it won't
+  # function if other value is set in hiera.
+  $backend_name = hiera('cinder::backend::veritas_hyperscale::volume_backend_name', 'Veritas_HyperScale'),
+  $step = Integer(hiera('step')),
+) {
+  include ::tripleo::profile::base::cinder::volume
+
+  if $step >= 4 {
+    cinder::backend::veritas_hyperscale { $backend_name :
+    }
+  }
+
+}
diff --git a/manifests/profile/base/database/mysql.pp b/manifests/profile/base/database/mysql.pp
index fbb8b11..3bf41cf 100644
--- a/manifests/profile/base/database/mysql.pp
+++ b/manifests/profile/base/database/mysql.pp
@@ -224,6 +224,9 @@ class tripleo::profile::base::database::mysql (
       # NOTE: by default zaqar uses mongodb
       include ::zaqar::db::mysql
     }
+    if hiera('veritas_hyperscale_controller_enabled', false) {
+      include ::veritas_hyperscale::db::mysql
+    }
   }
 
 }
diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp
index 91a660c..47b5276 100644
--- a/manifests/profile/base/keystone.pp
+++ b/manifests/profile/base/keystone.pp
@@ -347,5 +347,8 @@ class tripleo::profile::base::keystone (
     if hiera('novajoin_enabled', false) {
       include ::nova::metadata::novajoin::auth
     }
+    if hiera('veritas_hyperscale_controller_enabled', false) {
+      include ::veritas_hyperscale::hs_keystone
+    }
   }
 }
diff --git a/manifests/profile/base/rabbitmq.pp b/manifests/profile/base/rabbitmq.pp
index 8ab6049..d0b4a05 100644
--- a/manifests/profile/base/rabbitmq.pp
+++ b/manifests/profile/base/rabbitmq.pp
@@ -166,4 +166,7 @@ class tripleo::profile::base::rabbitmq (
     }
   }
 
+  if $step >= 1 and hiera('veritas_hyperscale_controller_enabled', false) {
+    include ::veritas_hyperscale::hs_rabbitmq
+  }
 }