diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-01-22 21:54:53 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-01-22 21:54:53 +0000 |
commit | f445a2ebf6e3a553e9339830e658938b65139517 (patch) | |
tree | 64151a444e14addf617ae5004c96cee858e8e586 /puppet/manifests/overcloud_cephstorage.pp | |
parent | 47b3a088b0c99facdc5b8f389e7046f28073ddc5 (diff) | |
parent | 867b36625e38972e7a74989134a1f89dcbdc0fe7 (diff) |
Merge "puppet: allow config of ad-hoc Ceph settings"
Diffstat (limited to 'puppet/manifests/overcloud_cephstorage.pp')
-rw-r--r-- | puppet/manifests/overcloud_cephstorage.pp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_cephstorage.pp b/puppet/manifests/overcloud_cephstorage.pp index 7444155c..1d801adc 100644 --- a/puppet/manifests/overcloud_cephstorage.pp +++ b/puppet/manifests/overcloud_cephstorage.pp @@ -38,6 +38,7 @@ if str2bool(hiera('ceph_osd_selinux_permissive', true)) { } -> Class['ceph::profile::osd'] } +include ::ceph::conf include ::ceph::profile::client include ::ceph::profile::osd |