Merge "Do not create fs and server side key from manila"
authorJenkins <jenkins@review.openstack.org>
Mon, 21 Aug 2017 23:55:32 +0000 (23:55 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 21 Aug 2017 23:55:32 +0000 (23:55 +0000)
1  2 
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),