From 6f0daae52fc65fd79e5cb2464b7d41bf3df12afd Mon Sep 17 00:00:00 2001
From: Oleksandr Martsyniuk <omartsyniuk@mirantis.com>
Date: Thu, 26 May 2016 13:30:10 +0300
Subject: [PATCH] Port number for Contrail API on Public VIP added to plugin
 settings

Change-Id: I4d18a06d1f5db0b52e123163cffda6346917ec19
Related-bug: #1583863
---
 .../puppet/modules/contrail/manifests/init.pp |  2 +-
 .../puppet/modules/contrail/manifests/vip.pp  | 20 ++++++++++++++++---
 environment_config.yaml                       | 13 +++++++-----
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/deployment_scripts/puppet/modules/contrail/manifests/init.pp b/deployment_scripts/puppet/modules/contrail/manifests/init.pp
index 8e9919c32..8f510bcc5 100644
--- a/deployment_scripts/puppet/modules/contrail/manifests/init.pp
+++ b/deployment_scripts/puppet/modules/contrail/manifests/init.pp
@@ -49,7 +49,7 @@ class contrail {
   $contrail_private_vip = $network_metadata['vips']['contrail_priv']['ipaddr']
   $contrail_mgmt_vip    = $contrail_private_vip
 
-  $contrail_api_public  = $settings['contrail_api_public']
+  $contrail_api_public_port  = $settings['contrail_api_public_port']
 
   # Public SSL for Contrail WebUI
   $public_ssl_hash    = hiera_hash('public_ssl', {})
diff --git a/deployment_scripts/puppet/modules/contrail/manifests/vip.pp b/deployment_scripts/puppet/modules/contrail/manifests/vip.pp
index a71e597da..e4c88cda2 100644
--- a/deployment_scripts/puppet/modules/contrail/manifests/vip.pp
+++ b/deployment_scripts/puppet/modules/contrail/manifests/vip.pp
@@ -28,7 +28,7 @@ class contrail::vip {
   }
 
   openstack::ha::haproxy_service { 'contrail-analytics-api':
-    order                  => '201',
+    order                  => '200',
     listen_port            => 8081,
     balancermember_port    => 9081,
     server_names           => $contrail::contrail_config_ips,
@@ -45,13 +45,27 @@ class contrail::vip {
   }
 
   openstack::ha::haproxy_service { 'contrail-configuration-api':
-    order                  => '202',
+    order                  => '201',
     listen_port            => 8082,
     balancermember_port    => 9100,
     server_names           => $contrail::contrail_config_ips,
     ipaddresses            => $contrail::contrail_config_ips,
-    public                 => $contrail::contrail_api_public,
+    public                 => false,
     internal               => true,
+    haproxy_config_options => { 'option'  => 'nolinger',
+                                'balance' => 'roundrobin',
+                                'timeout' => ['server 3m', 'client 3m'] },
+    balancermember_options => 'check inter 2000 rise 2 fall 3',
+  }
+
+  openstack::ha::haproxy_service { 'contrail-configuration-api-public':
+    order                  => '202',
+    listen_port            => $contrail::contrail_api_public_port,
+    balancermember_port    => 9100,
+    server_names           => $contrail::contrail_config_ips,
+    ipaddresses            => $contrail::contrail_config_ips,
+    public                 => true,
+    internal               => false,
     public_ssl             => $contrail::public_ssl,
     public_ssl_path        => $contrail::public_ssl_path,
     haproxy_config_options => { 'option'  => 'nolinger',
diff --git a/environment_config.yaml b/environment_config.yaml
index 0ebe50d26..04108c564 100644
--- a/environment_config.yaml
+++ b/environment_config.yaml
@@ -40,12 +40,15 @@ attributes:
     regex:
       source: '^(?:(6553[0-5])|(655[0-2]\d)|(65[0-4]\d{2})|(6[0-4]\d{3})|([1-5]\d{4})|([1-9]\d{1,3})|([1-9]))$'
       error: "Invalid target"
-  contrail_api_public:
-    value: true
-    label: "Contrail API on Public VIP"
-    description: "Toggles Contrail API endpoint for Public VIP. Enabling this option is incompatible with Murano, as it uses the same port, 8082"
+  contrail_api_public_port:
+    value: "8082"
+    label: "Listen port for Contrail API on Public VIP"
+    description: "The listen port for Contrail API endpoint for Public VIP. Default value 8082 may not be used if Murano is installed, as it uses the same port"
     weight: 62
-    type: "checkbox"
+    type: "text"
+    regex:
+      source: '^(6553[0-5]|655[0-2]\d|65[0-4]\d{2}|6[0-4]\d{3}|5\d{4}|[0-9]\d{0,3})$'
+      error: "Invalid port"
   contrail_global_dpdk:
     value: false
     label: "Enable DPDK feature for this environment."