6db227d7c9
Use haproxy-config package to package script and service file for haproxy package. Create patches sub-folder and move patches file from haproxy/haproxy folder to this sub-folder. Refactor haproxy-service-file.patch & haproxy-spec-add-init-script.patch as we use haproxy-config to package related files. Merged meta_add_support_for_tpm.patch & spec-add-haproxy-env-var-patch.patch to spec-include-TiS-changes.patch (renamed from spec-include-TiS-config.patch) as they just includes adding source code patches. Deployment test and ping test between VMs pass config and script files check pass. Story: 2003768 Task: 27584 Depends-on: https://review.openstack.org/#/c/614709/ Change-Id: I08fd8aa662533f4ce379f352ba9bab7616c905f5 Signed-off-by: zhipengl <zhipengs.liu@intel.com>
27 lines
783 B
Diff
27 lines
783 B
Diff
From 55d52d8bc9f649b4871336aaffd87fb7d931eac8 Mon Sep 17 00:00:00 2001
|
|
From: Scott Little <scott.little@windriver.com>
|
|
Date: Mon, 2 Oct 2017 16:12:36 -0400
|
|
Subject: [PATCH] WRS: 0001-Update-package-versioning-for-TIS-format.patch
|
|
|
|
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
|
|
---
|
|
SPECS/haproxy.spec | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/SPECS/haproxy.spec b/SPECS/haproxy.spec
|
|
index 39c0c86..b0d5862 100644
|
|
--- a/SPECS/haproxy.spec
|
|
+++ b/SPECS/haproxy.spec
|
|
@@ -8,7 +8,7 @@
|
|
|
|
Name: haproxy
|
|
Version: 1.5.18
|
|
-Release: 7%{?dist}
|
|
+Release: 7.el7%{?_tis_dist}.%{tis_patch_ver}
|
|
Summary: TCP/HTTP proxy and load balancer for high availability environments
|
|
|
|
Group: System Environment/Daemons
|
|
--
|
|
1.8.3.1
|
|
|