Refactor to extract get_mon_addresses.

diff --git a/ceph/libraries/default.rb b/ceph/libraries/default.rb
index baeb086fa51c37bbd24f726b758cb392f77bdb70..34cc1b08dd5b71ea0ba2dc1cee5484afcb7ec733 100644 (file)
--- 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 78fe279bd8c335c5203929cfb8cc8e285853a369..90d0dba3a917efa21aee8972f796fcfbf1eafc6b 100644 (file)
--- 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'