aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/haproxy.pp
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/haproxy.pp')
-rw-r--r--manifests/haproxy.pp20
1 files changed, 15 insertions, 5 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp
index e12ae77..924699b 100644
--- a/manifests/haproxy.pp
+++ b/manifests/haproxy.pp
@@ -678,6 +678,8 @@ class tripleo::haproxy (
contrail_discovery_ssl_port => 15998,
contrail_analytics_port => 8090,
contrail_analytics_ssl_port => 18090,
+ contrail_analytics_rest_port => 8081,
+ contrail_analytics_ssl_rest_port => 18081,
contrail_webui_http_port => 8080,
contrail_webui_https_port => 8143,
docker_registry_port => 8787,
@@ -1589,7 +1591,7 @@ class tripleo::haproxy (
if $contrail_config {
::tripleo::haproxy::endpoint { 'contrail_config':
public_virtual_ip => $public_virtual_ip,
- internal_ip => hiera('contrail_config_vip', $controller_virtual_ip),
+ internal_ip => hiera('contrail_config_vip', hiera('internal_api_virtual_ip')),
service_port => $ports[contrail_config_port],
ip_addresses => hiera('contrail_config_node_ips'),
server_names => hiera('contrail_config_node_ips'),
@@ -1597,7 +1599,7 @@ class tripleo::haproxy (
}
::tripleo::haproxy::endpoint { 'contrail_discovery':
public_virtual_ip => $public_virtual_ip,
- internal_ip => hiera('contrail_config_vip', $controller_virtual_ip),
+ internal_ip => hiera('contrail_config_vip', hiera('internal_api_virtual_ip')),
service_port => $ports[contrail_discovery_port],
ip_addresses => hiera('contrail_config_node_ips'),
server_names => hiera('contrail_config_node_ips'),
@@ -1607,17 +1609,25 @@ class tripleo::haproxy (
if $contrail_analytics {
::tripleo::haproxy::endpoint { 'contrail_analytics':
public_virtual_ip => $public_virtual_ip,
- internal_ip => hiera('contrail_analytics_vip', $controller_virtual_ip),
+ internal_ip => hiera('contrail_analytics_vip', hiera('internal_api_virtual_ip')),
service_port => $ports[contrail_analytics_port],
ip_addresses => hiera('contrail_config_node_ips'),
server_names => hiera('contrail_config_node_ips'),
public_ssl_port => $ports[contrail_analytics_ssl_port],
}
+ ::tripleo::haproxy::endpoint { 'contrail_analytics_rest':
+ public_virtual_ip => $public_virtual_ip,
+ internal_ip => hiera('contrail_analytics_vip', hiera('internal_api_virtual_ip')),
+ service_port => $ports[contrail_analytics_rest_port],
+ ip_addresses => hiera('contrail_analytics_node_ips', $::contrail_analytics_node_ips),
+ server_names => hiera('contrail_analytics_node_ips', $::contrail_analytics_node_ips),
+ public_ssl_port => $ports[contrail_analytics_ssl_rest_port],
+ }
}
if $contrail_webui {
::tripleo::haproxy::endpoint { 'contrail_webui_http':
public_virtual_ip => $public_virtual_ip,
- internal_ip => hiera('contrail_webui_vip', $controller_virtual_ip),
+ internal_ip => hiera('contrail_webui_vip', hiera('internal_api_virtual_ip')),
service_port => $ports[contrail_webui_http_port],
ip_addresses => hiera('contrail_config_node_ips'),
server_names => hiera('contrail_config_node_ips'),
@@ -1625,7 +1635,7 @@ class tripleo::haproxy (
}
::tripleo::haproxy::endpoint { 'contrail_webui_https':
public_virtual_ip => $public_virtual_ip,
- internal_ip => hiera('contrail_webui_vip', $controller_virtual_ip),
+ internal_ip => hiera('contrail_webui_vip', hiera('internal_api_virtual_ip')),
service_port => $ports[contrail_webui_https_port],
ip_addresses => hiera('contrail_config_node_ips'),
server_names => hiera('contrail_config_node_ips'),