diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-07-11 21:23:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-07-11 21:23:51 +0000 |
| commit | 7a5f0ac79457fcb4faae3fb0b8021de5b7dd1174 (patch) | |
| tree | e7bdf0e06b11f8aa9d4db628fc0bfc6a55814133 | |
| parent | adc02fd625b6be1ee6529a4c7646e62d793a206a (diff) | |
| parent | 6ffa7e31213b226a3665e5d69a17157c679d8a30 (diff) | |
Merge "Add ironic inspector as a terminated HAProxy endpoint"
| -rw-r--r-- | manifests/haproxy.pp | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp index e3e48ce..33185dc 100644 --- a/manifests/haproxy.pp +++ b/manifests/haproxy.pp @@ -193,6 +193,10 @@ # (optional) Enable or not Ironic API binding # Defaults to false # +# [*ironic_inspector*] +# (optional) Enable or not Ironic Inspector API binding +# Defaults to false +# # [*mysql*] # (optional) Enable or not MySQL Galera binding # Defaults to false @@ -240,6 +244,8 @@ # 'heat_cw_ssl_port' (Defaults to 13003) # 'ironic_api_port' (Defaults to 6385) # 'ironic_api_ssl_port' (Defaults to 13385) +# 'ironic_inspector_port' (Defaults to 5050) +# 'ironic_inspector_ssl_port' (Defaults to 13050) # 'keystone_admin_api_port' (Defaults to 35357) # 'keystone_admin_api_ssl_port' (Defaults to 13357) # 'keystone_public_api_port' (Defaults to 5000) @@ -302,6 +308,7 @@ class tripleo::haproxy ( $heat_cfn = false, $horizon = false, $ironic = false, + $ironic_inspector = false, $mysql = false, $mysql_clustercheck = false, $rabbitmq = false, @@ -330,6 +337,8 @@ class tripleo::haproxy ( heat_cw_ssl_port => 13003, ironic_api_port => 6385, ironic_api_ssl_port => 13385, + ironic_inspector_port => 5050, + ironic_inspector_ssl_port => 13050, keystone_admin_api_port => 35357, keystone_admin_api_ssl_port => 13357, keystone_public_api_port => 5000, @@ -754,6 +763,17 @@ class tripleo::haproxy ( } } + if $ironic_inspector { + ::tripleo::haproxy::endpoint { 'ironic-inspector': + public_virtual_ip => $public_virtual_ip, + internal_ip => hiera('ironic_inspector_vip', $controller_virtual_ip), + service_port => $ports[ironic_inspector_port], + ip_addresses => hiera('ironic_inspector_node_ips', $controller_hosts_real), + server_names => $controller_hosts_names_real, + public_ssl_port => $ports[ironic_inspector_ssl_port], + } + } + if $mysql_clustercheck { $mysql_listen_options = { 'option' => [ 'tcpka', 'httpchk' ], |