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_controller_pacemaker.pp | |
| parent | 47b3a088b0c99facdc5b8f389e7046f28073ddc5 (diff) | |
| parent | 867b36625e38972e7a74989134a1f89dcbdc0fe7 (diff) | |
Merge "puppet: allow config of ad-hoc Ceph settings"
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 } |