summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2015-05-11 15:26:27 +0200
committerGiulio Fidente <gfidente@redhat.com>2015-05-11 15:26:27 +0200
commitada9662b8b92fd4ec925407fd675c7941f6a3267 (patch)
treeef95cf19b574c814e8276d6299d41b92d4187ecc /puppet
parent607ea9c8d30d752b01881e2ac913c712f0243272 (diff)
Use pacemaker::resource::service instead of ::systemd
The puppet-pacemaker module realizes some abstraction for the different service types in ::service already. Change-Id: Icd897e18fda01b1bf4722a975c991e26341ac129 Closes-Bug: 1449988
Diffstat (limited to 'puppet')
-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 ba5f80a6..6512dc10 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -62,12 +62,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 <| |>
}
@@ -92,7 +92,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'],