summaryrefslogtreecommitdiffstats
path: root/puppet/manifests/overcloud_controller_pacemaker.pp
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-01-22 21:54:53 +0000
committerGerrit Code Review <review@openstack.org>2016-01-22 21:54:53 +0000
commitf445a2ebf6e3a553e9339830e658938b65139517 (patch)
tree64151a444e14addf617ae5004c96cee858e8e586 /puppet/manifests/overcloud_controller_pacemaker.pp
parent47b3a088b0c99facdc5b8f389e7046f28073ddc5 (diff)
parent867b36625e38972e7a74989134a1f89dcbdc0fe7 (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.pp3
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
}