From 7a5419cf30d56a8de808384bb93f0f3d96eaa8fa Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Fri, 23 Mar 2018 11:36:42 +0800
Subject: [PATCH] Fix ssl on zaqar

Change-Id: I02eab735494b6bcabc1e15dcc97e886e05018fab
---
 manifests/zaqar.pp | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/manifests/zaqar.pp b/manifests/zaqar.pp
index ec176000f..649485d32 100644
--- a/manifests/zaqar.pp
+++ b/manifests/zaqar.pp
@@ -7,14 +7,8 @@ class openstack_integration::zaqar {
       notify  => Service['httpd'],
       require => Package['zaqar-common'],
     }
-    $key_file = "/etc/zaqar/ssl/private/${::fqdn}.pem"
-    $crt_file = $::openstack_integration::params::cert_path
     Exec['update-ca-certificates'] ~> Service['httpd']
-  } else {
-    $key_file = undef
-    $crt_file = undef
   }
-
   class {'::zaqar::logging':
     debug => true,
   }
@@ -58,8 +52,8 @@ class openstack_integration::zaqar {
   class { '::zaqar::wsgi::apache':
     bind_host => $::openstack_integration::config::ip_for_url,
     ssl       => $::openstack_integration::config::ssl,
-    ssl_cert  => $crt_file,
-    ssl_key   => $key_file,
+    ssl_cert  => $::openstack_integration::params::cert_path,
+    ssl_key   => "/etc/zaqar/ssl/private/${::fqdn}.pem",
     workers   => 2,
   }
   include ::zaqar::db::sync