diff options
| author |   Dan Prince <dprince@redhat.com> | 2016-01-18 08:55:39 -0500 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2016-01-22 10:30:42 -0500 |
| commit | 867b36625e38972e7a74989134a1f89dcbdc0fe7 (patch) | |
| tree | f580e55a1f96a87da40dfb800f5bd7604a124e98 /puppet/manifests/overcloud_controller_pacemaker.pp | |
| parent | a2300bc50e4675bbd6d892d40dd14221ebbf0c5d (diff) | |
puppet: allow config of ad-hoc Ceph settings
Including ::ceph::conf on ceph roles will allow ad-hoc
(non-puppet managed) settings to be made in the
ceph.conf using Hiera.
Change-Id: I656a0ecde465023d7afad9371aa3c5c270078a67
Diffstat (limited to 'puppet/manifests/overcloud_controller_pacemaker.pp')
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index f8d3fd76..c7b24114 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -461,6 +461,7 @@ MYSQL_HOST=localhost\n", class { '::ceph::profile::params': mon_initial_members => downcase(hiera('ceph_mon_initial_members')), } + include ::ceph::conf include ::ceph::profile::mon } @@ -479,10 +480,12 @@ MYSQL_HOST=localhost\n", } -> Class['ceph::profile::osd'] } + include ::ceph::conf include ::ceph::profile::osd } if str2bool(hiera('enable_external_ceph', false)) { + include ::ceph::conf include ::ceph::profile::client } |