From 2547db4c7c0e5378ec9f08545668f27fe13a1278 Mon Sep 17 00:00:00 2001 From: Zhe Hu Date: Mon, 24 Dec 2018 15:03:04 +0800 Subject: [PATCH] rebase puppet-openstacklib patch to CentOS 7.6 version Test: Pass build and simplex deploy test Depends-On: https://review.openstack.org/627142 Story: 2004522 Task: 28401 Change-Id: I146141e040949f3f287e636d1039939d3a749bc1 Signed-off-by: Zhe Hu --- ...0001-Update-package-versioning-for-TIS-format.patch | 4 ++-- .../centos/meta_patches/0002-Add-TIS-patch.patch | 2 +- ...03-distributed-keystone-for-system-controller.patch | 10 ++++++++-- .../puppet-openstacklib-11.3.0/centos/srpm_path | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch index 350bed51d..e9f6fc500 100644 --- a/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ b/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch @@ -14,12 +14,12 @@ index 7f3bbd8..8bf2c1b 100644 @@ -1,7 +1,7 @@ %{!?upstream_version: %global upstream_version %{version}%{?milestone}} Name: puppet-openstacklib - Version: 11.3.0 + Version: 11.5.0 -Release: 1%{?dist} +Release: 1.el7%{?_tis_dist}.%{tis_patch_ver} Summary: Puppet OpenStack Libraries License: ASL 2.0 -- -1.8.3.1 +2.7.4 diff --git a/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/meta_patches/0002-Add-TIS-patch.patch b/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/meta_patches/0002-Add-TIS-patch.patch index 5fea85474..d8ae8a044 100644 --- a/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/meta_patches/0002-Add-TIS-patch.patch +++ b/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/meta_patches/0002-Add-TIS-patch.patch @@ -11,7 +11,7 @@ diff --git a/SPECS/puppet-openstacklib.spec b/SPECS/puppet-openstacklib.spec index 0ed0c1d..38faf85 100644 --- a/SPECS/puppet-openstacklib.spec +++ b/SPECS/puppet-openstacklib.spec -@@ -8,6 +8,7 @@ License: Apache-2.0 +@@ -8,6 +8,7 @@ License: ASL 2.0 URL: https://launchpad.net/puppet-openstacklib Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz diff --git a/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/patches/0003-distributed-keystone-for-system-controller.patch b/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/patches/0003-distributed-keystone-for-system-controller.patch index fc0b4a898..ee33321e2 100644 --- a/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/patches/0003-distributed-keystone-for-system-controller.patch +++ b/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/patches/0003-distributed-keystone-for-system-controller.patch @@ -1,14 +1,17 @@ +From 2d8bb7de61c91b3adbf7486a3f0ad43f97f49a52 Mon Sep 17 00:00:00 2001 From: Kam Nasim Date: Fri, 11 May 2018 11:35:59 -0600 Subject: [PATCH 1/1] Add Distributed Keystone region name option for system controller --- - lib/puppet/provider/openstack.rb | 1 + + lib/puppet/provider/openstack.rb | 1 + 1 file changed, 1 insertion(+) +diff --git a/lib/puppet/provider/openstack.rb b/lib/puppet/provider/openstack.rb +index 53f2366..232d615 100644 --- a/lib/puppet/provider/openstack.rb +++ b/lib/puppet/provider/openstack.rb -@@ -55,6 +55,7 @@ class Puppet::Provider::Openstack < Pupp +@@ -55,6 +55,7 @@ class Puppet::Provider::Openstack < Puppet::Provider Timeout.timeout(command_timeout(action)) do args.unshift('--os-interface', 'internal') if systemcontroller? @@ -16,3 +19,6 @@ Subject: [PATCH 1/1] Add Distributed Keystone region name option for system cont args.unshift('--os-region-name', 'SystemController') end openstack_command *args +-- +2.7.4 + diff --git a/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/srpm_path b/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/srpm_path index 609c1cc18..f5c0ad0fd 100644 --- a/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/srpm_path +++ b/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/srpm_path @@ -1 +1 @@ -mirror:Source/puppet-openstacklib-11.3.0-1.el7.src.rpm +mirror:Source/puppet-openstacklib-11.5.0-1.el7.src.rpm