From 9d4cb0e001a7d8fa06d0bbedbdcf2ff3c24f1e7c Mon Sep 17 00:00:00 2001
From: Olivier Bourdon <obourdon@mirantis.com>
Date: Mon, 22 May 2017 15:27:33 +0200
Subject: [PATCH] Fix haproxy SSL configuration

Closes-Bug: #1691160

Change-Id: If7ef7281cd0ca4bff357948401115fc9d32af54a
---
 .../puppet/modules/plugin_zabbix/manifests/ha/haproxy.pp       | 1 +
 .../puppet/modules/plugin_zabbix/manifests/params.pp           | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/deployment_scripts/puppet/modules/plugin_zabbix/manifests/ha/haproxy.pp b/deployment_scripts/puppet/modules/plugin_zabbix/manifests/ha/haproxy.pp
index 18caf2c..e61b457 100644
--- a/deployment_scripts/puppet/modules/plugin_zabbix/manifests/ha/haproxy.pp
+++ b/deployment_scripts/puppet/modules/plugin_zabbix/manifests/ha/haproxy.pp
@@ -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',
diff --git a/deployment_scripts/puppet/modules/plugin_zabbix/manifests/params.pp b/deployment_scripts/puppet/modules/plugin_zabbix/manifests/params.pp
index 4ba201d..9c0cb30 100644
--- a/deployment_scripts/puppet/modules/plugin_zabbix/manifests/params.pp
+++ b/deployment_scripts/puppet/modules/plugin_zabbix/manifests/params.pp
@@ -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"