diff --git a/config/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/config/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch index a3ce7e230..bf72c73f5 100644 --- a/config/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ b/config/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch @@ -3,23 +3,25 @@ From: Scott Little Date: Mon, 20 Mar 2017 11:10:38 -0400 Subject: [PATCH 1/2] WRS: 0001-Update-package-versioning-for-TIS-format.patch +Conflicts: + SPECS/puppet-haproxy.spec --- SPECS/puppet-haproxy.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS/puppet-haproxy.spec b/SPECS/puppet-haproxy.spec -index 7d4b215..afb20d5 100644 +index 6944e73..a975f60 100644 --- a/SPECS/puppet-haproxy.spec +++ b/SPECS/puppet-haproxy.spec @@ -8,7 +8,7 @@ Name: puppet-haproxy Version: 1.5.0 --Release: 4%{?alphatag}%{?dist} -+Release: 4.6ffcb07git.el7%{?_tis_dist}.%{tis_patch_ver} +-Release: 2%{?alphatag}%{?dist} ++Release: 2.6ee8180git.el7%{?_tis_dist}.%{tis_patch_ver} Summary: Configures HAProxy servers and manages the configuration of backend member servers. - License: ASL 2.0 + License: Apache-2.0 -- -2.7.4 +1.8.3.1 diff --git a/config/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/0002-Add-TIS-patch.patch b/config/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/0002-Add-TIS-patch.patch index 736d7c05f..98a8119ed 100644 --- a/config/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/0002-Add-TIS-patch.patch +++ b/config/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/0002-Add-TIS-patch.patch @@ -8,10 +8,10 @@ Subject: [PATCH 2/2] WRS: 0002-Add-TIS-patch.patch 1 file changed, 2 insertions(+) diff --git a/SPECS/puppet-haproxy.spec b/SPECS/puppet-haproxy.spec -index afb20d5..f58bd74 100644 +index a975f60..a843f00 100644 --- a/SPECS/puppet-haproxy.spec +++ b/SPECS/puppet-haproxy.spec -@@ -15,6 +15,7 @@ License: ASL 2.0 +@@ -15,6 +15,7 @@ License: Apache-2.0 URL: https://github.com/puppetlabs/puppetlabs-haproxy Source0: https://github.com/puppetlabs/%{upstream_name}/archive/%{commit}.tar.gz#/%{upstream_name}-%{shortcommit}.tar.gz @@ -28,5 +28,5 @@ index afb20d5..f58bd74 100644 find . -type f -name ".*" -exec rm {} + find . -size 0 -exec rm {} + -- -2.7.4 +1.8.3.1 diff --git a/config/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/0003-disable-config-validation-prechecks.patch b/config/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/0003-disable-config-validation-prechecks.patch new file mode 100644 index 000000000..45843fcd7 --- /dev/null +++ b/config/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/0003-disable-config-validation-prechecks.patch @@ -0,0 +1,32 @@ +From 8a01ac3f649282ade4c136a2c1cb1b8bbbab28de Mon Sep 17 00:00:00 2001 +From: Kam Nasim +Date: Fri, 26 May 2017 17:18:23 -0400 +Subject: [PATCH] 0003-disable-config-validation-prechecks + +--- + SPECS/puppet-haproxy.spec | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/SPECS/puppet-haproxy.spec b/SPECS/puppet-haproxy.spec +index a843f00..a0a9be1 100644 +--- a/SPECS/puppet-haproxy.spec ++++ b/SPECS/puppet-haproxy.spec +@@ -16,6 +16,7 @@ URL: https://github.com/puppetlabs/puppetlabs-haproxy + + Source0: https://github.com/puppetlabs/%{upstream_name}/archive/%{commit}.tar.gz#/%{upstream_name}-%{shortcommit}.tar.gz + Patch0001: 0001-Roll-up-TIS-patches.patch ++Patch0002: 0002-disable-config-validation-prechecks.patch + + BuildArch: noarch + +@@ -29,6 +30,7 @@ Configures HAProxy servers and manages the configuration of backend member serve + %prep + %setup -q -n %{upstream_name}-%{upstream_version} + %patch0001 -p1 ++%patch0002 -p1 + + find . -type f -name ".*" -exec rm {} + + find . -size 0 -exec rm {} + +-- +1.8.3.1 + diff --git a/config/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/0004-Add-global_options-patch.patch b/config/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/0004-Add-global_options-patch.patch index b2b8737ef..003253db9 100644 --- a/config/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/0004-Add-global_options-patch.patch +++ b/config/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/0004-Add-global_options-patch.patch @@ -8,25 +8,25 @@ Subject: [PATCH] Add global_options patch 1 file changed, 2 insertions(+) diff --git a/SPECS/puppet-haproxy.spec b/SPECS/puppet-haproxy.spec -index f58bd74..e944081 100644 +index a0a9be1..a446384 100644 --- a/SPECS/puppet-haproxy.spec +++ b/SPECS/puppet-haproxy.spec -@@ -16,6 +16,7 @@ URL: https://github.com/puppetlabs/puppetlabs-haproxy - +@@ -17,6 +17,7 @@ URL: https://github.com/puppetlabs/puppetlabs-haproxy Source0: https://github.com/puppetlabs/%{upstream_name}/archive/%{commit}.tar.gz#/%{upstream_name}-%{shortcommit}.tar.gz Patch0001: 0001-Roll-up-TIS-patches.patch + Patch0002: 0002-disable-config-validation-prechecks.patch +Patch0003: 0003-Fix-global_options-log-default-value.patch BuildArch: noarch -@@ -29,6 +30,7 @@ Configures HAProxy servers and manages the configuration of backend member serve - %prep +@@ -31,6 +32,7 @@ Configures HAProxy servers and manages the configuration of backend member serve %setup -q -n %{upstream_name}-%{upstream_version} %patch0001 -p1 + %patch0002 -p1 +%patch0003 -p1 find . -type f -name ".*" -exec rm {} + find . -size 0 -exec rm {} + -- -2.7.4 +1.8.3.1 diff --git a/config/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/PATCH_ORDER b/config/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/PATCH_ORDER index 1774143c5..893476741 100644 --- a/config/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/PATCH_ORDER +++ b/config/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/PATCH_ORDER @@ -1,3 +1,4 @@ 0001-Update-package-versioning-for-TIS-format.patch 0002-Add-TIS-patch.patch +0003-disable-config-validation-prechecks.patch 0004-Add-global_options-patch.patch diff --git a/config/puppet-modules/puppet-haproxy-1.5.0/centos/patches/0001-Roll-up-TIS-patches.patch b/config/puppet-modules/puppet-haproxy-1.5.0/centos/patches/0001-Roll-up-TIS-patches.patch index 15b3575d6..e2a87934d 100644 --- a/config/puppet-modules/puppet-haproxy-1.5.0/centos/patches/0001-Roll-up-TIS-patches.patch +++ b/config/puppet-modules/puppet-haproxy-1.5.0/centos/patches/0001-Roll-up-TIS-patches.patch @@ -9,10 +9,10 @@ Subject: [PATCH] Roll up TIS patches 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/config.pp b/manifests/config.pp -index 51c2741..4007bb8 100644 +index 781b6fa..785740d 100644 --- a/manifests/config.pp +++ b/manifests/config.pp -@@ -75,8 +75,8 @@ define haproxy::config ( +@@ -68,8 +68,8 @@ define haproxy::config ( if $_global_options['chroot'] { file { $_global_options['chroot']: ensure => directory, @@ -24,20 +24,20 @@ index 51c2741..4007bb8 100644 } } diff --git a/manifests/init.pp b/manifests/init.pp -index f1109d0..54a1640 100644 +index e2d3d92..b0369f7 100644 --- a/manifests/init.pp +++ b/manifests/init.pp -@@ -110,8 +110,8 @@ +@@ -101,8 +101,8 @@ class haproxy ( - $package_ensure = 'present', - $package_name = $haproxy::params::package_name, -- $service_ensure = 'running', -- $service_manage = true, + $package_ensure = 'present', + $package_name = $haproxy::params::package_name, +- $service_ensure = 'running', +- $service_manage = true, + $service_ensure = false, + $service_manage = false, - $service_options = $haproxy::params::service_options, - $sysconfig_options = $haproxy::params::sysconfig_options, - $global_options = $haproxy::params::global_options, + $service_options = $haproxy::params::service_options, + $sysconfig_options = $haproxy::params::sysconfig_options, + $global_options = $haproxy::params::global_options, -- -2.7.4 +1.8.3.1 diff --git a/config/puppet-modules/puppet-haproxy-1.5.0/centos/patches/0002-disable-config-validation-prechecks.patch b/config/puppet-modules/puppet-haproxy-1.5.0/centos/patches/0002-disable-config-validation-prechecks.patch new file mode 100644 index 000000000..0f99586c3 --- /dev/null +++ b/config/puppet-modules/puppet-haproxy-1.5.0/centos/patches/0002-disable-config-validation-prechecks.patch @@ -0,0 +1,30 @@ +From 73b4a43227e36aa32103e7d8a69bcb35678f7e6c Mon Sep 17 00:00:00 2001 +From: Kam Nasim +Date: Fri, 26 May 2017 17:04:32 -0400 +Subject: [PATCH] disable configuration validation during haproxy manifest + apply since some files/options referenced in the configuration (such as for + TPM) may still be in flight while the haproxy manifest applies. This + validation option is a bit of an overkill anyways since it doesn't cause + Packstack to fail the manifest application, and is a soft error log but with + the added disadvantage of not applying any haproxy configuration (even the + sane bits) on a validation failure + +--- + manifests/config.pp | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/manifests/config.pp b/manifests/config.pp +index 785740d..4d084fa 100644 +--- a/manifests/config.pp ++++ b/manifests/config.pp +@@ -47,7 +47,6 @@ define haproxy::config ( + owner => '0', + group => '0', + mode => '0644', +- validate_cmd => '/usr/sbin/haproxy -f % -c', + } + + # Simple Header +-- +1.8.3.1 + diff --git a/config/puppet-modules/puppet-haproxy-1.5.0/centos/patches/0003-Fix-global_options-log-default-value.patch b/config/puppet-modules/puppet-haproxy-1.5.0/centos/patches/0003-Fix-global_options-log-default-value.patch index 3ae648710..44a6ec0cd 100644 --- a/config/puppet-modules/puppet-haproxy-1.5.0/centos/patches/0003-Fix-global_options-log-default-value.patch +++ b/config/puppet-modules/puppet-haproxy-1.5.0/centos/patches/0003-Fix-global_options-log-default-value.patch @@ -8,10 +8,10 @@ Subject: [PATCH] Fix global_options log default value 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/params.pp b/manifests/params.pp -index d7b9fa9..b4553f2 100644 +index 21e6bb0..b29e427 100644 --- a/manifests/params.pp +++ b/manifests/params.pp -@@ -16,7 +16,7 @@ class haproxy::params { +@@ -15,7 +15,7 @@ class haproxy::params { 'Archlinux', 'Debian', 'Redhat', 'Gentoo', 'Suse' : { $package_name = 'haproxy' $global_options = { @@ -21,5 +21,5 @@ index d7b9fa9..b4553f2 100644 'pidfile' => '/var/run/haproxy.pid', 'maxconn' => '4000', -- -2.7.4 +1.8.3.1 diff --git a/config/puppet-modules/puppet-haproxy-1.5.0/centos/srpm_path b/config/puppet-modules/puppet-haproxy-1.5.0/centos/srpm_path index d270e8e79..c4e216add 100644 --- a/config/puppet-modules/puppet-haproxy-1.5.0/centos/srpm_path +++ b/config/puppet-modules/puppet-haproxy-1.5.0/centos/srpm_path @@ -1 +1 @@ -mirror:Source/puppet-haproxy-1.5.0-4.6ffcb07git.el7.src.rpm +mirror:Source/puppet-haproxy-1.5.0-2.6ee8180git.el7.src.rpm