diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-10-23 08:47:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-10-23 08:47:56 +0000 |
| commit | 0b9c8fb56ae508aafca7219bfaff6e75afdfa9c2 (patch) | |
| tree | 276829a3ce18bc1b524292761ed0f0e2c1e8b838 /manifests | |
| parent | 9d8a6b6e740332c141b8fa6312b2a8ea315bea70 (diff) | |
| parent | 43d6dc468dc33e3af3b3de99c41b2ff479e61db7 (diff) | |
Merge "Enable communication between UI and the Undercloud by making HAProxy proxy for the UI"
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/haproxy.pp | 20 | ||||
| -rw-r--r-- | manifests/ui.pp | 2 |
2 files changed, 21 insertions, 1 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp index 04ce27e..02dddf1 100644 --- a/manifests/haproxy.pp +++ b/manifests/haproxy.pp @@ -263,6 +263,10 @@ # (optional) Enable or not Zaqar Websockets binding # Defaults to false # +# [*ui*] +# (optional) Enable or not TripleO UI +# Defaults to false +# # [*aodh_network*] # (optional) Specify the network aodh is running on. # Defaults to hiera('aodh_api_network', undef) @@ -480,6 +484,7 @@ class tripleo::haproxy ( $ceph_rgw = hiera('ceph_rgw_enabled', false), $opendaylight = hiera('opendaylight_api_enabled', false), $zaqar_ws = hiera('zaqar_api_enabled', false), + $ui = hiera('enable_ui', false), $aodh_network = hiera('aodh_api_network', undef), $ceilometer_network = hiera('ceilometer_api_network', undef), $ceph_rgw_network = hiera('ceph_rgw_network', undef), @@ -552,6 +557,8 @@ class tripleo::haproxy ( swift_proxy_ssl_port => 13808, trove_api_port => 8779, trove_api_ssl_port => 13779, + ui_port => 3000, + ui_ssl_port => 443, zaqar_api_port => 8888, zaqar_api_ssl_port => 13888, ceph_rgw_port => 8080, @@ -1231,4 +1238,17 @@ class tripleo::haproxy ( 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], + } + } + } diff --git a/manifests/ui.pp b/manifests/ui.pp index dc51bfc..41ad8d6 100644 --- a/manifests/ui.pp +++ b/manifests/ui.pp @@ -70,7 +70,7 @@ # class tripleo::ui ( $servername = $::fqdn, - $bind_host = undef, + $bind_host = hiera('controller_host'), $ui_port = 3000, $keystone_url = hiera('keystone_auth_uri_v2'), $heat_url = hiera('heat::keystone::auth::public_url', undef), |