From 8dd63cf88c5ddd2b7c441cee6e3bff37e5577d80 Mon Sep 17 00:00:00 2001
From: Maksym Yatsenko <myatsenko@mirantis.com>
Date: Fri, 18 Mar 2016 12:16:34 +0200
Subject: [PATCH] Updates to properly assign values for $tls_cacertdir

'None' value was changed to '' value and "if" operator was
added to correct assign values to $tls_cacertdir.

Change-Id: Idaf3f9f4e2ea44d739523f4969792f72fe4eba07
Closes-Bug: #1558595
---
 .../puppet/modules/plugin_ldap/manifests/controller.pp    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/deployment_scripts/puppet/modules/plugin_ldap/manifests/controller.pp b/deployment_scripts/puppet/modules/plugin_ldap/manifests/controller.pp
index 6e0eeae..398ebfe 100644
--- a/deployment_scripts/puppet/modules/plugin_ldap/manifests/controller.pp
+++ b/deployment_scripts/puppet/modules/plugin_ldap/manifests/controller.pp
@@ -48,9 +48,11 @@ class plugin_ldap::controller {
     $ca_chain       = pick($::fuel_settings['ldap']['ca_chain'], false)
     $cacertfile     = '/usr/local/share/ca-certificates/cacert-ldap.crt'
 
-    $tls_cacertdir  = $ca_chain ? {
-      default => 'None',
-      true    => '/etc/ssl/certs',
+    if $ca_chain {
+      $tls_cacertdir = '/etc/ssl/certs'
+    }
+    else {
+      $tls_cacertdir = ''
     }
 
     if $ca_chain {