From 17e87c67773210c016b2442652d38bbd54a9d831 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 27 Feb 2014 11:08:49 +0100 Subject: [PATCH] Move RHEL-specific bit out of founder-exclusive code path --- recipes/default.rb | 9 +++++++++ recipes/setup.rb | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/recipes/default.rb b/recipes/default.rb index 3d9cd29..89237bd 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -41,3 +41,12 @@ end if node[:pacemaker][:founder] include_recipe "pacemaker::setup" end + +if platform_family? "rhel" + execute "sleep 2" + + service "pacemaker" do + action [ :enable, :start ] + notifies :restart, "service[clvm]", :immediately + end +end diff --git a/recipes/setup.rb b/recipes/setup.rb index 29a747f..d56b2d6 100644 --- a/recipes/setup.rb +++ b/recipes/setup.rb @@ -30,12 +30,3 @@ execute "crm initial configuration" do user "root" command "crm configure load replace #{crm_conf}" end - -if platform_family? "rhel" - execute "sleep 2" - - service "pacemaker" do - action [ :enable, :start ] - notifies :restart, "service[clvm]", :immediately - end -end