starlingx/integ
Code Issues Proposed changes
d9ca4b8bcb
integ/config/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch

26 lines
798 B
Diff
Raw Normal View History

StarlingX open source release updates Signed-off-by: Dean Troyer <dtroyer@gmail.com>
2018-05-30 16:17:22 -07:00
From 60166c6f060244ec2d1416d8a05d22fd6353424f Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 20 Mar 2017 11:10:38 -0400
Subject: [PATCH 1/2] WRS: 0001-Update-package-versioning-for-TIS-format.patch
---
SPECS/puppet-haproxy.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/puppet-haproxy.spec b/SPECS/puppet-haproxy.spec
CentOS 7.5 upgrade for puppet-haproxy package 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>
2018-09-07 01:06:10 +08:00
index 7d4b215..afb20d5 100644
StarlingX open source release updates Signed-off-by: Dean Troyer <dtroyer@gmail.com>
2018-05-30 16:17:22 -07:00
--- a/SPECS/puppet-haproxy.spec
+++ b/SPECS/puppet-haproxy.spec
@@ -8,7 +8,7 @@
Name: puppet-haproxy
Version: 1.5.0
CentOS 7.5 upgrade for puppet-haproxy package 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>
2018-09-07 01:06:10 +08:00
-Release: 4%{?alphatag}%{?dist}
+Release: 4.6ffcb07git.el7%{?_tis_dist}.%{tis_patch_ver}
StarlingX open source release updates Signed-off-by: Dean Troyer <dtroyer@gmail.com>
2018-05-30 16:17:22 -07:00
Summary: Configures HAProxy servers and manages the configuration of backend member servers.
CentOS 7.5 upgrade for puppet-haproxy package 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>
2018-09-07 01:06:10 +08:00
License: ASL 2.0
StarlingX open source release updates Signed-off-by: Dean Troyer <dtroyer@gmail.com>
2018-05-30 16:17:22 -07:00
--
CentOS 7.5 upgrade for puppet-haproxy package 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>
2018-09-07 01:06:10 +08:00
2.7.4
StarlingX open source release updates Signed-off-by: Dean Troyer <dtroyer@gmail.com>
2018-05-30 16:17:22 -07:00
Copy Permalink