starlingx/integ
Code Issues Proposed changes

rebase puppet-horizon patch to CentOS7.5

Browse Source 
Story: 2003389
Task: 24505
Depends-On: https://review.openstack.org/596989

Change-Id: I3284b46da8a82485da8fa746a242490277015fa0
Signed-off-by: slin14 <shuicheng.lin@intel.com>
This commit is contained in:
slin14 2018-08-28 21:43:15 +08:00
parent 80480de8bc
commit f51a74eed9
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config/puppet-modules/openstack/puppet-horizon-9.5.0/centos/meta_patches/0001-Update-package-versioning-for-Titanium-format.patch
View File

@ -1,25 +1,25 @@
From d445a072fdcebc0cb7ba988502eac6356edd05a7 Mon Sep 17 00:00:00 2001 From c194c17c2022a34ce1c1eddd930eb943aaa2e1ce Mon Sep 17 00:00:00 2001
From: Jack Ding <jack.ding@windriver.com> From: Jack Ding <jack.ding@windriver.com>
Date: Fri, 11 May 2018 21:39:23 -0400 Date: Fri, 11 May 2018 21:39:23 -0400
Subject: [PATCH 1/3] Update package versioning for Titanium format Subject: [PATCH] Update package versioning for Titanium format
--- ---
SPECS/puppet-horizon.spec | 2 +- SPECS/puppet-horizon.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/puppet-horizon.spec b/SPECS/puppet-horizon.spec diff --git a/SPECS/puppet-horizon.spec b/SPECS/puppet-horizon.spec
index faab8ab..03ed102 100644 index 955f56c..511cf25 100644
--- a/SPECS/puppet-horizon.spec --- a/SPECS/puppet-horizon.spec
+++ b/SPECS/puppet-horizon.spec +++ b/SPECS/puppet-horizon.spec
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
%{!?upstream_version: %global upstream_version %{version}%{?milestone}} %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
Name: puppet-horizon Name: puppet-horizon
Version: 9.5.0 Version: 11.5.0
-Release: 1%{?dist} -Release: 1%{?dist}
+Release: 1.el7%{?_tis_dist}.%{tis_patch_ver} +Release: 1.el7%{?_tis_dist}.%{tis_patch_ver}
Summary: Puppet module for OpenStack Horizon Summary: Puppet module for OpenStack Horizon
License: Apache-2.0 License: ASL 2.0
-- --
1.8.3.1 2.7.4

2
config/puppet-modules/openstack/puppet-horizon-9.5.0/centos/srpm_path
View File

@ -1 +1 @@
mirror:Source/puppet-horizon-9.5.0-1.el7.src.rpm mirror:Source/puppet-horizon-11.5.0-1.el7.src.rpm