openstack/puppet-tripleo
Code Issues Proposed changes

Merge "Enable communication between UI and the Undercloud by making HAProxy proxy for the UI"

Browse Source
This commit is contained in:
Jenkins 2016-10-23 08:47:56 +00:00 committed by Gerrit Code Review
commit 0b9c8fb56a
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
manifests/haproxy.pp
View File

@ -263,6 +263,10 @@
# (optional) Enable or not Zaqar Websockets binding # (optional) Enable or not Zaqar Websockets binding
# Defaults to false # Defaults to false
# #
# [*ui*]
# (optional) Enable or not TripleO UI
# Defaults to false
#
# [*aodh_network*] # [*aodh_network*]
# (optional) Specify the network aodh is running on. # (optional) Specify the network aodh is running on.
# Defaults to hiera('aodh_api_network', undef) # Defaults to hiera('aodh_api_network', undef)
@ -480,6 +484,7 @@ class tripleo::haproxy (
$ceph_rgw = hiera('ceph_rgw_enabled', false), $ceph_rgw = hiera('ceph_rgw_enabled', false),
$opendaylight = hiera('opendaylight_api_enabled', false), $opendaylight = hiera('opendaylight_api_enabled', false),
$zaqar_ws = hiera('zaqar_api_enabled', false), $zaqar_ws = hiera('zaqar_api_enabled', false),
$ui = hiera('enable_ui', false),
$aodh_network = hiera('aodh_api_network', undef), $aodh_network = hiera('aodh_api_network', undef),
$ceilometer_network = hiera('ceilometer_api_network', undef), $ceilometer_network = hiera('ceilometer_api_network', undef),
$ceph_rgw_network = hiera('ceph_rgw_network', undef), $ceph_rgw_network = hiera('ceph_rgw_network', undef),
@ -552,6 +557,8 @@ class tripleo::haproxy (
swift_proxy_ssl_port => 13808, swift_proxy_ssl_port => 13808,
trove_api_port => 8779, trove_api_port => 8779,
trove_api_ssl_port => 13779, trove_api_ssl_port => 13779,
ui_port => 3000,
ui_ssl_port => 443,
zaqar_api_port => 8888, zaqar_api_port => 8888,
zaqar_api_ssl_port => 13888, zaqar_api_ssl_port => 13888,
ceph_rgw_port => 8080, ceph_rgw_port => 8080,
@ -1231,4 +1238,17 @@ class tripleo::haproxy (
service_network => $zaqar_api_network, service_network => $zaqar_api_network,
} }
} }
if $ui {
::tripleo::haproxy::endpoint { 'ui':
public_virtual_ip => $public_virtual_ip,
internal_ip => hiera('ui_vip', $controller_virtual_ip),
service_port => $ports[ui_port],
ip_addresses => hiera('ui_ips', $controller_hosts_real),
server_names => $controller_hosts_names_real,
mode => 'http',
public_ssl_port => $ports[ui_ssl_port],
}
}
} }

2
manifests/ui.pp
View File

@ -70,7 +70,7 @@
# #
class tripleo::ui ( class tripleo::ui (
$servername = $::fqdn, $servername = $::fqdn,
$bind_host = undef, $bind_host = hiera('controller_host'),
$ui_port = 3000, $ui_port = 3000,
$keystone_url = hiera('keystone_auth_uri_v2'), $keystone_url = hiera('keystone_auth_uri_v2'),
$heat_url = hiera('heat::keystone::auth::public_url', undef), $heat_url = hiera('heat::keystone::auth::public_url', undef),