Fixup manila-cephfs native backend defaults

The puppet-tripleo side for manila-cephfs landed without specifying
defaults for all class params [1] so when cephfs isn't enabled
e.g. only generic, then you will get errors for those params. See
review comments at [2] for reports of this.

This will fixup the manila-cephfs puppet-tripleo side to be more
in line with the tidy up adding netapp at [3]. The config is all
moved tripleo-heat-templates side. The tht review for this
is at https://review.openstack.org/#/c/358525/ and that will now
depend on this review.

[1] https://review.openstack.org/#/c/354047/
[2] https://review.openstack.org/#/c/354019/
[3] https://review.openstack.org/#/c/354014/
Change-Id: I918f6f23ae0bd3542bcfe1bf0c797d4e6aa8f4d9

diff --git a/manifests/profile/pacemaker/manila.pp b/manifests/profile/pacemaker/manila.pp
index 961278b..45373f6 100644 (file)
--- a/manifests/profile/pacemaker/manila.pp
+++ b/manifests/profile/pacemaker/manila.pp
@@ -27,44 +27,9 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
-# [*manila_cephfsnative_enable*]
-#   (Optional) Enable the CephFS Native backend.
-#   Defaults to hiera('manila_cephfsnative_enable_backend', 'false')
-#
-# [*cephfs_handles_share_servers*]
-#   (Optional)
-#   Defaults to hiera('manila::backend::cephfsnative::driver_handles_share_servers', false)
-#
-# [*cephfs_backend_name*]
-#   (Optional)
-#   Defaults to hiera('manila::backend::cephfsnative::cephfs_backend_name')
-#
-# [*cephfs_conf_path*]
-#   (Optional)
-#   Defaults to hiera('manila::backend::cephfsnative::cephfs_conf_path')
-#
-# [*cephfs_auth_id*]
-#   (Optional)
-#   Defaults to hiera('manila::backend::cephfsnative::cephfs_auth_id')
-#
-# [*cephfs_cluster_name*]
-#   (Optional)
-#   Defaults to hiera('manila::backend::cephfsnative::cephfs_cluster_name')
-#
-# [*cephfs_enable_snapshots*]
-#   (Optional)
-#   Defaults to hiera('manila::backend::cephfsnative::cephfs_enable_snapshots')
-#
 class tripleo::profile::pacemaker::manila (
   $bootstrap_node                   = hiera('bootstrap_nodeid'),
   $step                             = hiera('step'),
-  $manila_cephfsnative_enable       = hiera('manila::backend::cephfsnative::enable_backend', false),
-  $cephfs_handles_share_servers     = hiera('manila::backend::cephfsnative::driver_handles_share_servers'),
-  $cephfs_backend_name              = hiera('manila::backend::cephfsnative::cephfs_backend_name'),
-  $cephfs_conf_path                 = hiera('manila::backend::cephfsnative::cephfs_conf_path'),
-  $cephfs_auth_id                   = hiera('manila::backend::cephfsnative::cephfs_auth_id'),
-  $cephfs_cluster_name              = hiera('manila::backend::cephfsnative::cephfs_cluster_name'),
-  $cephfs_enable_snapshots          = hiera('manila::backend::cephfsnative::cephfs_enable_snapshots'),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $pacemaker_master = true
@@ -116,15 +81,16 @@ class tripleo::profile::pacemaker::manila (
     }
 
     # manila cephfsnative:
+    $manila_cephfsnative_enable = hiera('manila::backend::cephfsnative::enable_backend', false)
     if $manila_cephfsnative_enable {
       $manila_cephfsnative_backend = hiera('manila::backend::cephfsnative::title')
       manila::backend::cephfsnative { $manila_cephfsnative_backend :
-        driver_handles_share_servers => $cephfs_handles_share_servers,
-        cephfs_backend_name          => $cephfs_backend_name,
-        cephfs_conf_path             => $cephfs_conf_path,
-        cephfs_auth_id               => $cephfs_auth_id,
-        cephfs_cluster_name          => $cephfs_cluster_name,
-        cephfs_enable_snapshots      => $cephfs_enable_snapshots,
+        driver_handles_share_servers => hiera('manila::backend::cephfsnative::driver_handles_share_servers', false),
+        share_backend_name           => hiera('manila::backend::cephfsnative::share_backend_name'),
+        cephfs_conf_path             => hiera('manila::backend::cephfsnative::cephfs_conf_path'),
+        cephfs_auth_id               => hiera('manila::backend::cephfsnative::cephfs_auth_id'),
+        cephfs_cluster_name          => hiera('manila::backend::cephfsnative::cephfs_cluster_name'),
+        cephfs_enable_snapshots      => hiera('manila::backend::cephfsnative::cephfs_enable_snapshots'),
       }
     }