From 381e6fa7cd41dac1329c9a63e523601d782efb7b Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Thu, 21 Sep 2017 16:05:55 +0800
Subject: [PATCH] Other puppet modules beaker test failed

Other puppet modules beaker test failed because ssl is true in
config.pp[0].

http://logs.openstack.org/29/503929/1/check/gate-puppet-panko-puppet-beaker-rspec-centos-7/6bf04c8/console.html#_2017-09-21_03_44_30_275738

Change-Id: I2be2f83ff83be11514fe1fa848c7d11c62a56c11
Closes-Bug: #1718600
---
 fixtures/scenario001.pp | 1 +
 fixtures/scenario003.pp | 1 +
 fixtures/scenario004.pp | 1 +
 manifests/config.pp     | 4 ++--
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/fixtures/scenario001.pp b/fixtures/scenario001.pp
index d0e2ae069..57fabbea7 100644
--- a/fixtures/scenario001.pp
+++ b/fixtures/scenario001.pp
@@ -38,6 +38,7 @@ case $::osfamily {
 
 include ::openstack_integration
 class { '::openstack_integration::config':
+  ssl            => true,
   ipv6           => $ipv6,
   rpc_backend    => $om_rpc,
   notify_backend => $om_notify,
diff --git a/fixtures/scenario003.pp b/fixtures/scenario003.pp
index d0fb149af..2400a6f33 100644
--- a/fixtures/scenario003.pp
+++ b/fixtures/scenario003.pp
@@ -47,6 +47,7 @@ if ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemmajrelease
 
 include ::openstack_integration
 class { '::openstack_integration::config':
+  ssl  => true,
   ipv6 => $ipv6,
 }
 include ::openstack_integration::cacert
diff --git a/fixtures/scenario004.pp b/fixtures/scenario004.pp
index 98a4ca4bc..0bfe495bb 100644
--- a/fixtures/scenario004.pp
+++ b/fixtures/scenario004.pp
@@ -29,6 +29,7 @@ if $::operatingsystem == 'Ubuntu' {
 
 include ::openstack_integration
 class { '::openstack_integration::config':
+  ssl  => true,
   ipv6 => $ipv6,
 }
 
diff --git a/manifests/config.pp b/manifests/config.pp
index c41b9d052..561ac3e07 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -2,7 +2,7 @@
 #
 # [*ssl*]
 #   (optional) Boolean to enable or not SSL.
-#   Defaults to true.
+#   Defaults to false.
 #
 # [*ipv6*]
 #   (optional) Boolean to enable or not IPv6.
@@ -18,7 +18,7 @@
 #   Defaults to 'rabbit'.
 #
 class openstack_integration::config (
-  $ssl            = true,
+  $ssl            = false,
   $ipv6           = false,
   $rpc_backend    = 'rabbit',
   $notify_backend = 'rabbit',