572a1870a5
Add memcached as a service on controllers/AIOs. Prop an upstream fix to puppet-stdlib package to support collapsed format ipv6 address like 'abcd::3'. Patch puppet-horizon and puppet-swift package to update version requirements for puppet-memcached-3.0.2. Comment out service parameters in memcached service file that incompatible to Centos 7. Change-Id: I8837597c1d7d8ec874f3e9ba858ea308860d15ea Signed-off-by: Jack Ding <jack.ding@windriver.com>
37 lines
966 B
Diff
37 lines
966 B
Diff
From 81fde18810538b9c01e32ef76dbbd0b48761dcb8 Mon Sep 17 00:00:00 2001
|
|
From: Jack Ding <jack.ding@windriver.com>
|
|
Date: Fri, 11 May 2018 21:45:14 -0400
|
|
Subject: [PATCH 2/3] update memcached dependency
|
|
|
|
---
|
|
SPECS/puppet-horizon.spec | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/SPECS/puppet-horizon.spec b/SPECS/puppet-horizon.spec
|
|
index 03ed102..6ad467c 100644
|
|
--- a/SPECS/puppet-horizon.spec
|
|
+++ b/SPECS/puppet-horizon.spec
|
|
@@ -9,6 +9,9 @@ URL: https://launchpad.net/puppet-horizon
|
|
|
|
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz
|
|
|
|
+# WRS Patches
|
|
+Patch0001: 0001-update-memcached-dependency.patch
|
|
+
|
|
BuildArch: noarch
|
|
|
|
Requires: puppet-apache
|
|
@@ -21,6 +24,9 @@ Puppet module for OpenStack Horizon
|
|
|
|
%prep
|
|
%setup -q -n openstack-horizon-%{upstream_version}
|
|
+# WRS Patches
|
|
+%patch0001 -p1
|
|
+
|
|
|
|
find . -type f -name ".*" -exec rm {} +
|
|
find . -size 0 -exec rm {} +
|
|
--
|
|
1.8.3.1
|
|
|