From 6d8c6e1f308463be3dcebc671675ee7f58d28678 Mon Sep 17 00:00:00 2001
From: Alejandro Andreu <alejandroandreu@openmailbox.org>
Date: Thu, 17 Nov 2016 17:22:44 +0100
Subject: Changes default MidoNet API port on HAProxy

The default port of the MidoNet Cluster (formerly known as MidoNet API)
is now 8181 instead of 8081.

Since this parameter is configurable through the settings, the default
value for the port has been added to the $service_ports array.

Change-Id: I2785d3109993bca0bd68077ff55cfeafbf594e19
---
 manifests/haproxy.pp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'manifests')

diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp
index 2cd69c5..a1fad7a 100644
--- a/manifests/haproxy.pp
+++ b/manifests/haproxy.pp
@@ -567,6 +567,7 @@ class tripleo::haproxy (
     keystone_public_api_ssl_port => 13000,
     manila_api_port => 8786,
     manila_api_ssl_port => 13786,
+    midonet_cluster_port => 8181,
     neutron_api_port => 9696,
     neutron_api_ssl_port => 13696,
     nova_api_port => 8774,
@@ -1220,10 +1221,10 @@ class tripleo::haproxy (
     }
   }
 
-  $midonet_api_vip = hiera('midonet_api_vip', $controller_virtual_ip)
+  $midonet_cluster_vip = hiera('midonet_cluster_vip', $controller_virtual_ip)
   $midonet_bind_opts = {
-    "${midonet_api_vip}:8081" => [],
-    "${public_virtual_ip}:8081" => [],
+    "${midonet_cluster_vip}:${ports[midonet_cluster_port]}" => [],
+    "${public_virtual_ip}:${ports[midonet_cluster_port]}"   => [],
   }
 
   if $midonet_api {
@@ -1233,7 +1234,7 @@ class tripleo::haproxy (
     }
     haproxy::balancermember { 'midonet_api':
       listening_service => 'midonet_api',
-      ports             => '8081',
+      ports             => $ports[midonet_cluster_port],
       ipaddresses       => hiera('midonet_api_node_ips', $controller_hosts_real),
       server_names      => hiera('midonet_api_node_names', $controller_hosts_names_real),
       options           => $haproxy_member_options,
-- 
cgit 1.2.3-korg