From: Tommi Virtanen <tv@inktank.com>
Date: Wed, 25 Jul 2012 21:26:19 +0000 (-0700)
Subject: Refactor to extract get_mon_nodes() utility function.
X-Git-Tag: eval1~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cb7a5824b8bfbcb19e9fe4a2aed30c38ab21322c;p=ceph-cookbooks.git

Refactor to extract get_mon_nodes() utility function.
---

diff --git a/libraries/default.rb b/libraries/default.rb
index e640fff..59bc8bd 100644
--- a/libraries/default.rb
+++ b/libraries/default.rb
@@ -2,16 +2,9 @@ def is_crowbar?()
   return defined?(Chef::Recipe::Barclamp) != nil
 end
 
-def get_mon_addresses()
+def get_mon_nodes()
   mons = []
 
-  # make sure if this node runs ceph-mon, it's always included even if
-  # search is laggy; put it first in the hopes that clients will talk
-  # primarily to local node
-  if node['roles'].include? 'ceph-mon'
-    mons << node
-  end
-
   if is_crowbar?
     mon_roles = search(:role, 'name:crowbar-* AND run_list:role\[ceph-mon\]')
     if not mon_roles.empty?
@@ -21,6 +14,20 @@ def get_mon_addresses()
   else
     mons += search(:node, "role:ceph-mon AND chef_environment:#{node.chef_environment}")
   end
+  return mons
+end
+
+def get_mon_addresses()
+  mons = []
+
+  # make sure if this node runs ceph-mon, it's always included even if
+  # search is laggy; put it first in the hopes that clients will talk
+  # primarily to local node
+  if node['roles'].include? 'ceph-mon'
+    mons << node
+  end
+
+  mons += get_mon_nodes()
 
   if is_crowbar?
     mon_addresses = mons.map { |node| Chef::Recipe::Barclamp::Inventory.get_network_by_type(node, "admin").address }