From 856267cbabe7f0418d9f4404507141ee82815dc3 Mon Sep 17 00:00:00 2001
From: nitishkrishna <nitishk@juniper.net>
Date: Tue, 2 Feb 2016 15:05:28 -0800
Subject: [PATCH] Closes-Bug: #1541111 : Horizon Console not seen in
 SM-Provisioned HA setup

Novncproxy ip address and port not set correctly
ip should be external/internal vip if available.
frontend port must be used: 6080

Change-Id: Id850479240922f0119ecf4829d3bd22ec5a0cc52
---
 .../contrail/manifests/contrail_openstack.pp       | 14 +++++---------
 .../openstack/manifests/common/contrail/nova.pp    |  2 +-
 .../modules/openstack/manifests/common/nova.pp     |  2 +-
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/contrail/environment/modules/contrail/manifests/contrail_openstack.pp b/contrail/environment/modules/contrail/manifests/contrail_openstack.pp
index ff92ebb5..0f6d7fc0 100644
--- a/contrail/environment/modules/contrail/manifests/contrail_openstack.pp
+++ b/contrail/environment/modules/contrail/manifests/contrail_openstack.pp
@@ -77,20 +77,16 @@
 )  {
     # Main code for class
 
-    #slect the novncproxy based on presence of internal_vip
-    if ($internal_vip != ''){
-        $novncproxy_port = '6999'
-        $vnc_proxy_host = $host_control_ip
-    } else {
-        $novncproxy_port = '5999'
-        $vnc_proxy_host = $openstack_mgmt_ip
-    }
+    #select the novncproxy based on presence of internal_vip
 
     if ($external_vip != '') {
+        $vnc_base_url_port = '6080'
         $vnc_base_url_ip = $external_vip
     } elsif ($internal_vip != '' ) {
+        $vnc_base_url_port = '6080'
         $vnc_base_url_ip = $internal_vip
     } else {
+        $vnc_base_url_port = '5999'
         $vnc_base_url_ip = $openstack_mgmt_ip
     }
 
@@ -110,7 +106,7 @@
     class {'::contrail::exec_create_ec2rc_file':}
 
     $nova_params =  {
-      'DEFAULT/novncproxy_base_url' => { value => "http://${vnc_base_url_ip}:${novncproxy_port}/vnc_auto.html"},
+      'DEFAULT/novncproxy_base_url' => { value => "http://${vnc_base_url_ip}:${vnc_base_url_port}/vnc_auto.html"},
       'DEFAULT/ec2_private_dns_show_ip' => { value => 'False' },
     }
     create_resources(nova_config,$nova_params, {} )
diff --git a/contrail/environment/modules/openstack/manifests/common/contrail/nova.pp b/contrail/environment/modules/openstack/manifests/common/contrail/nova.pp
index 80d4c17d..e649f92e 100644
--- a/contrail/environment/modules/openstack/manifests/common/contrail/nova.pp
+++ b/contrail/environment/modules/openstack/manifests/common/contrail/nova.pp
@@ -53,7 +53,7 @@
 
   if ($internal_vip != "" and $internal_vip != undef) {
       class { '::nova::vncproxy':
-	host    => $::openstack::config::controller_address_api,
+	host    => $::contrail::params::host_ip,
 	enabled => $is_controller,
         port => '6999',
       }
diff --git a/contrail/environment/modules/openstack/manifests/common/nova.pp b/contrail/environment/modules/openstack/manifests/common/nova.pp
index 2d29f00d..1e0c72eb 100644
--- a/contrail/environment/modules/openstack/manifests/common/nova.pp
+++ b/contrail/environment/modules/openstack/manifests/common/nova.pp
@@ -90,7 +90,7 @@
     }
 
     class { '::nova::vncproxy':
-      host    => $::openstack::config::controller_address_api,
+      host    => $::contrail::params::host_ip,
       enabled => $is_controller,
       port => '6999',
     }