From: Tommi Virtanen <tv@inktank.com>
Date: Fri, 8 Jun 2012 21:53:18 +0000 (-0700)
Subject: Refactor to extract get_mon_addresses.
X-Git-Tag: eval1~31
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0a2dacfa6d4ba3ce900a3f79ee50be7e28e55d24;p=ceph-cookbooks.git

Refactor to extract get_mon_addresses.
---

diff --git a/ceph/libraries/default.rb b/ceph/libraries/default.rb
index baeb086..34cc1b0 100644
--- a/ceph/libraries/default.rb
+++ b/ceph/libraries/default.rb
@@ -2,6 +2,15 @@ def is_crowbar?()
   return defined?(Chef::Recipe::Barclamp) != nil
 end
 
+def get_mon_addresses()
+  if is_crowbar?
+    mon_addresses = search(:node, "role:ceph-mon AND ceph_config_environment:#{node['ceph']['config']['environment']}").map { |node| Chef::Recipe::Barclamp::Inventory.get_network_by_type(node, "admin").address + ":6789" }
+  else
+    mon_addresses = search(:node, "role:ceph-mon AND chef_environment:#{node.chef_environment}").map { |node| node["ipaddress"] + ":6789" }
+  end
+  return mon_addresses
+end
+
 QUORUM_STATES = ['leader', 'peon']
 
 def have_quorum?()
diff --git a/ceph/recipes/conf.rb b/ceph/recipes/conf.rb
index 78fe279..90d0dba 100644
--- a/ceph/recipes/conf.rb
+++ b/ceph/recipes/conf.rb
@@ -1,8 +1,4 @@
-if is_crowbar?
-  mon_addresses = search(:node, "role:ceph-mon AND ceph_config_environment:#{node['ceph']['config']['environment']}").map { |node| Chef::Recipe::Barclamp::Inventory.get_network_by_type(node, "admin").address + ":6789" }
-else
-  mon_addresses = search(:node, "role:ceph-mon AND chef_environment:#{node.chef_environment}").map { |node| node["ipaddress"] + ":6789" }
-end
+mon_addresses = get_mon_addresses()
 
 template '/etc/ceph/ceph.conf' do
   source 'ceph.conf.erb'