summaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-05-14 16:35:13 +0000
committerGerrit Code Review <review@openstack.org>2015-05-14 16:35:13 +0000
commitcbd56fa47fd9fbd8a596acae56028a2bf128fb45 (patch)
treeb81dfb46403fd987177d1a56e35f9f4cf9848cea /puppet/manifests
parent2c6ea075cf0eeeea5cc7cf6ea9b654c325096d32 (diff)
parentada9662b8b92fd4ec925407fd675c7941f6a3267 (diff)
Merge "Use pacemaker::resource::service instead of ::systemd"
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp6
1 files changed, 3 insertions, 3 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index d9618e82..c7df2567 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -63,12 +63,12 @@ if hiera('step') >= 1 {
pacemaker::resource::ip { 'public_vip':
ip_address => $public_vip,
}
- pacemaker::resource::systemd { 'haproxy':
+ pacemaker::resource::service { 'haproxy':
clone => true,
}
}
- Class['::pacemaker::corosync'] -> Pacemaker::Resource::Systemd <| |>
+ Class['::pacemaker::corosync'] -> Pacemaker::Resource::Service <| |>
}
@@ -93,7 +93,7 @@ if hiera('step') >= 2 {
$ceilometer_mongodb_conn_string = "mongodb://${mongo_node_string}/ceilometer?replicaSet=${mongodb_replset}"
if downcase(hiera('bootstrap_nodeid')) == $::hostname {
- pacemaker::resource::systemd { 'mongod' :
+ pacemaker::resource::service { 'mongod' :
options => "op start timeout=120s",
clone => true,
before => Exec['mongodb-ready'],