e51a4a5bbe
This change can fix the issue during package upgrade that causes config_controller failed at step 6. Root cause is that package update introduced a warning output in frontend.pp file which will cause puppet-manifest-apply failure as it do not allow any warning existed in puppet log. Story: 2003389 Task: 24504 Depends-On: https://review.openstack.org/#/c/600359/ Change-Id: Iabfa73e80859feeccbc1e6c81032169f94812013 Signed-off-by: zhipengl <zhipengs.liu@intel.com>
27 lines
850 B
Diff
27 lines
850 B
Diff
From 16163f14c8f9b1b81b6e394c31c72030938435c7 Mon Sep 17 00:00:00 2001
|
|
From: Don Penney <don.penney@windriver.com>
|
|
Date: Tue, 4 Sep 2018 20:01:53 +0800
|
|
Subject: [PATCH] Fix global_options log default value
|
|
|
|
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
|
|
---
|
|
manifests/params.pp | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/manifests/params.pp b/manifests/params.pp
|
|
index 21e6bb0..b29e427 100644
|
|
--- a/manifests/params.pp
|
|
+++ b/manifests/params.pp
|
|
@@ -15,7 +15,7 @@ class haproxy::params {
|
|
'Archlinux', 'Debian', 'Redhat', 'Gentoo', 'Suse' : {
|
|
$package_name = 'haproxy'
|
|
$global_options = {
|
|
- 'log' => "${::ipaddress} local0",
|
|
+ 'log' => 'global',
|
|
'chroot' => '/var/lib/haproxy',
|
|
'pidfile' => '/var/run/haproxy.pid',
|
|
'maxconn' => '4000',
|
|
--
|
|
2.7.4
|
|
|