puppetlabs-haproxy: update for stx 5.0

[pti/rtp.git] / meta-starlingx / meta-stx-cloud / recipes-support / puppet / files / puppetlabs-haproxy / 0003-Fix-global_options-log-default-value.patch

diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppetlabs-haproxy/0003-Fix-global_options-log-default-value.patch b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppetlabs-haproxy/0003-Fix-global_options-log-default-value.patch
deleted file mode 100644 (file)
index 79d1e82..0000000
--- a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppetlabs-haproxy/0003-Fix-global_options-log-default-value.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
-