From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 21 Aug 2017 23:55:32 +0000 (+0000)
Subject: Merge "Do not create fs and server side key from manila"
X-Git-Tag: opnfv-6.0.0~57
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=92c04bbb77468214d2f1cba7c11f1de50fa6ad63;p=apex-puppet-tripleo.git

Merge "Do not create fs and server side key from manila"
---

92c04bbb77468214d2f1cba7c11f1de50fa6ad63
diff --cc manifests/profile/pacemaker/manila.pp
index 6db0b86,8e91f46..3fb4e0b
--- a/manifests/profile/pacemaker/manila.pp
+++ b/manifests/profile/pacemaker/manila.pp
@@@ -56,9 -46,7 +50,8 @@@
  class tripleo::profile::pacemaker::manila (
    $backend_generic_enabled = hiera('manila_backend_generic_enabled', false),
    $backend_netapp_enabled  = hiera('manila_backend_netapp_enabled', false),
 +  $backend_vmax_enabled    = hiera('manila_backend_vmax_enabled', false),
    $backend_cephfs_enabled  = hiera('manila_backend_cephfs_enabled', false),
-   $ceph_mds_enabled        = hiera('ceph_mds_enabled', false),
    $bootstrap_node          = hiera('manila_share_short_bootstrap_node_name'),
    $step                    = Integer(hiera('step')),
    $pcs_tries               = hiera('pcs_tries', 20),