aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-12-11 00:19:33 +0000
committerGerrit Code Review <review@openstack.org>2016-12-11 00:19:33 +0000
commit34253ecfb5c8e1f2b44567892785d2dc3af695d0 (patch)
tree02ad6231bdf6ce319e5053216d2f4b8080fd99a5
parent53954ff5034c6690a959568ee31eaaf4f5f02979 (diff)
parent6d8c6e1f308463be3dcebc671675ee7f58d28678 (diff)
Merge "Changes default MidoNet API port on HAProxy"
-rw-r--r--manifests/haproxy.pp9
1 files changed, 5 insertions, 4 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp
index a4ab0cc..515f49a 100644
--- a/manifests/haproxy.pp
+++ b/manifests/haproxy.pp
@@ -580,6 +580,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,
@@ -1250,10 +1251,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 {
@@ -1263,7 +1264,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,