openstack/puppet-tripleo
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins
2017-08-21 23:55:32 +00:00
committed by Gerrit Code Review
parent 1dc48e6b94 897d594633
commit 92c04bbb77
2 changed files with 5 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/profile/base/ceph/mds.pp
View File

@@ -32,4 +32,9 @@ class tripleo::profile::base::ceph::mds (
if $step >= 3 {
include ::ceph::profile::mds
}
# when deploying mds, create also cephfs which is used by manila
if $step >= 4 {
include ::ceph::profile::fs
}
}

28
manifests/profile/pacemaker/manila.pp
View File

@@ -34,12 +34,6 @@
# (Optional) Whether or not the cephfs backend is enabled
# Defaults to hiera('manila_backend_cephfs_enabled', false)
#
# [*ceph_mds_enabled*]
# (Optional) Whether or not the ceph mds is enabled. This option is used
# to distinguish if an external ceph is used or if ceph is deployed by
# tripleo. By default ceph mds is not deployed by tripleo.
# Defaults to hiera('ceph_mds_enabled', false)
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('manila_share_short_bootstrap_node_name')
@@ -58,7 +52,6 @@ class tripleo::profile::pacemaker::manila (
$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),
@@ -124,12 +117,6 @@ class tripleo::profile::pacemaker::manila (
$cephfs_auth_id = hiera('manila::backend::cephfsnative::cephfs_auth_id')
$keyring_path = "/etc/ceph/ceph.client.${cephfs_auth_id}.keyring"
# $ceph_mds_enabled is used to distinguish if an external ceph is used or
# if ceph is deployed by TripleO
if $ceph_mds_enabled {
include ::ceph::profile::fs
}
manila::backend::cephfsnative { $manila_cephfsnative_backend :
driver_handles_share_servers => hiera('manila::backend::cephfsnative::driver_handles_share_servers', false),
share_backend_name => hiera('manila::backend::cephfsnative::share_backend_name'),
@@ -139,21 +126,6 @@ class tripleo::profile::pacemaker::manila (
cephfs_enable_snapshots => hiera('manila::backend::cephfsnative::cephfs_enable_snapshots'),
}
if !defined(Resource['ceph::key', "client.${cephfs_auth_id}"]) {
ceph::key { "client.${cephfs_auth_id}" :
secret => hiera('manila::backend::cephfsnative::ceph_client_key'),
keyring_path => $keyring_path,
# inject the new key into ceph cluster only if ceph is deployed by
# tripleo (if external ceph is used it should be added manually)
inject => $ceph_mds_enabled,
user => 'manila',
cap_mds => 'allow *',
cap_mon => 'allow r, allow command \"auth del\", allow command \"auth caps\", \
allow command \"auth get\", allow command \"auth get-or-create\"',
cap_osd => 'allow rw'
}
}
ceph_config {
"client.${cephfs_auth_id}/keyring": value => $keyring_path;
"client.${cephfs_auth_id}/client mount uid": value => 0;