x
/
fuel-plugin-external-zabbix
Code Issues Proposed changes

Fix haproxy SSL configuration 

Closes-Bug: #1691160

Change-Id: If7ef7281cd0ca4bff357948401115fc9d32af54a
This commit is contained in:
Olivier Bourdon 2017-05-22 15:27:33 +02:00
parent 846e166406
commit 9d4cb0e001
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deployment_scripts/puppet/modules/plugin_zabbix/manifests/ha/haproxy.pp
View File

@ -100,6 +100,7 @@ class plugin_zabbix::ha::haproxy {
listen_port => 443,
balancermember_port => 80,
public_ssl => true,
public_ssl_path => '/var/lib/astute/haproxy/public_haproxy.pem',
haproxy_config_options => {
'option' => ['forwardfor', 'httpchk', 'httpclose', 'httplog'],
'stick-table' => 'type ip size 200k expire 30m',

3
deployment_scripts/puppet/modules/plugin_zabbix/manifests/params.pp
View File

@ -182,7 +182,8 @@ class plugin_zabbix::params {
$zabbix_admin_password_md5 = md5($zabbix_hash['password'])
#api
if $ssl[horizon] == true {
$use_ssl = $ssl[horizon] or $ssl[services]
if $use_ssl {
$api_url = "https://${mgmt_vip}${frontend_base}/api_jsonrpc.php"
}else{
$api_url = "http://${mgmt_vip}${frontend_base}/api_jsonrpc.php"