From fc32b88216a40c44451f5629e727e75060ee0c34 Mon Sep 17 00:00:00 2001
From: Adam Spiers <aspiers@suse.com>
Date: Thu, 30 Jan 2014 15:17:49 +0000
Subject: [PATCH] ensure that crmsh is installed early enough

---
 attributes/default.rb |  2 +-
 recipes/setup.rb      | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/attributes/default.rb b/attributes/default.rb
index 41ba2be..d87acd1 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -15,7 +15,7 @@
 
 case node.platform
 when 'suse'
-  default[:pacemaker][:platform][:packages] = %w(pacemaker)
+  default[:pacemaker][:platform][:packages] = %w(pacemaker crmsh)
 
   # pacemaker-mgmt-client provides hb_gui, which it's useful
   # to run over ssh.
diff --git a/recipes/setup.rb b/recipes/setup.rb
index 1e9ba39..ef5bb06 100644
--- a/recipes/setup.rb
+++ b/recipes/setup.rb
@@ -18,6 +18,12 @@
 # limitations under the License.
 #
 
+node[:pacemaker][:platform][:packages].each do |pkg|
+  package pkg do
+    action :install
+  end
+end
+
 crm_conf = node[:pacemaker][:crm][:initial_config_file]
 template crm_conf do
   source "crm-initial.conf.erb"
@@ -31,12 +37,6 @@ execute "crm initial configuration" do
   command "crm configure load replace #{crm_conf}"
 end
 
-node[:pacemaker][:platform][:packages].each do |pkg|
-  package pkg do
-    action :install
-  end
-end
-
 if platform_family? "rhel"
   execute "sleep 2"