From ada9662b8b92fd4ec925407fd675c7941f6a3267 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Mon, 11 May 2015 15:26:27 +0200 Subject: 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 --- puppet/manifests/overcloud_controller_pacemaker.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'puppet') 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'], -- cgit 1.2.3-korg