From 0031da9393598167161962de69d1872bf3cbf61f Mon Sep 17 00:00:00 2001
From: Dobroslaw Zybort <dobroslaw.zybort@ts.fujitsu.com>
Date: Mon, 10 Apr 2017 12:50:25 +0200
Subject: [PATCH] Update hosts-cluster with proper virtual IP

---
 chef/cookbooks/monasca/libraries/helper.rb         | 14 ++++++++------
 chef/cookbooks/monasca/recipes/master.rb           |  4 ++++
 .../templates/default/monasca-hosts-cluster.erb    | 13 +++++--------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/chef/cookbooks/monasca/libraries/helper.rb b/chef/cookbooks/monasca/libraries/helper.rb
index 50c178d866..0c70c1ce4d 100644
--- a/chef/cookbooks/monasca/libraries/helper.rb
+++ b/chef/cookbooks/monasca/libraries/helper.rb
@@ -76,16 +76,18 @@ def get_host_for_monitoring_url(node)
       ).address
     end
 
-    def network_settings(node)
-      @ip ||= Chef::Recipe::Barclamp::Inventory.get_network_by_type(
+    def get_vip_for_monitoring_cluster(node)
+      CrowbarPacemakerHelper.cluster_vip(
         node, "monitoring"
-      ).address
+      )
+    end
+
+    def network_settings(node)
+      @ip ||= get_host_for_monitoring_url(node)
       @cluster_monitoring_ip ||= nil
 
       if node[:monasca][:ha][:enabled] && !@cluster_monitoring_ip
-        @cluster_monitoring_ip = CrowbarPacemakerHelper.cluster_vip(
-          node, "monitoring"
-        )
+        @cluster_monitoring_ip = get_vip_for_monitoring_cluster(node)
       end
 
       if node[:monasca][:ha][:enabled]
diff --git a/chef/cookbooks/monasca/recipes/master.rb b/chef/cookbooks/monasca/recipes/master.rb
index 8f2b3e141b..5ad931e7be 100644
--- a/chef/cookbooks/monasca/recipes/master.rb
+++ b/chef/cookbooks/monasca/recipes/master.rb
@@ -35,6 +35,9 @@
     "monasca-hosts-cluster.erb"
   end
 
+monasca_node = search(:node, "roles:monasca-server")[0]
+monitoring_vip = MonascaHelper.get_vip_for_monitoring_cluster(monasca_node)
+
 template "/opt/monasca-installer/monasca-hosts" do
   source hosts_template
   owner "root"
@@ -43,6 +46,7 @@
   variables(
     monasca_host: monasca_hosts[0],
     monasca_hosts: monasca_hosts,
+    monitoring_vip: monitoring_vip,
     ansible_ssh_user: "root",
     keystone_host: keystone_settings["public_url_host"]
   )
diff --git a/chef/cookbooks/monasca/templates/default/monasca-hosts-cluster.erb b/chef/cookbooks/monasca/templates/default/monasca-hosts-cluster.erb
index 9cc1c27075..50b0114ca9 100644
--- a/chef/cookbooks/monasca/templates/default/monasca-hosts-cluster.erb
+++ b/chef/cookbooks/monasca/templates/default/monasca-hosts-cluster.erb
@@ -12,10 +12,9 @@ localhost                        ansible_connection=local
 keystone-node                    ansible_ssh_host=<%= @keystone_host %> ansible_ssh_user=<%= @ansible_ssh_user %>
 
 # Load balancer hosts
-# TODO
-#monasca-log-api-balancer-node    ansible_ssh_host= ansible_ssh_user=<%= @ansible_ssh_user %>
-#monasca-api-balancer-node        ansible_ssh_host= ansible_ssh_user=<%= @ansible_ssh_user %>
-#kibana-balancer-node             ansible_ssh_host= ansible_ssh_user=<%= @ansible_ssh_user %>
+monasca-log-api-balancer-node    ansible_ssh_host=<%= @monitoring_vip %> ansible_ssh_user=<%= @ansible_ssh_user %>
+monasca-api-balancer-node        ansible_ssh_host=<%= @monitoring_vip %> ansible_ssh_user=<%= @ansible_ssh_user %>
+kibana-balancer-node             ansible_ssh_host=<%= @monitoring_vip %> ansible_ssh_user=<%= @ansible_ssh_user %>
 
 # ElasticSearch nodes for cluster
 <% @monasca_hosts.each_with_index do |host, index| %>
@@ -78,8 +77,7 @@ keystone-node                    ansible_ssh_host=<%= @keystone_host %> ansible_
 <% end %>
 
 # Load balancer node
-# TODO
-#balancer-node                    ansible_ssh_host= ansible_ssh_user=<%= @ansible_ssh_user %>
+balancer-node                    ansible_ssh_host=<%= @monitoring_vip %> ansible_ssh_user=<%= @ansible_ssh_user %>
 
 #Storm Nimbus nodes
 <% @monasca_hosts.each_with_index do |host, index| %>
@@ -110,8 +108,7 @@ monasca-thresh-node              ansible_ssh_host=<%= @monasca_host %> ansible_s
 <% end %>
 
 # Keepalived nodes
-# TODO
-#keepalived-virtual-node ansible_ssh_host= ansible_ssh_user=<%= @ansible_ssh_user %>
+keepalived-virtual-node ansible_ssh_host=<%= @monitoring_vip %> ansible_ssh_user=<%= @ansible_ssh_user %>
 
 <% @monasca_hosts.each_with_index do |host, index| %>
 <%= "keepalived-node-#{index} ansible_ssh_host=#{host}" %> ansible_ssh_user=<%= @ansible_ssh_user %>