diff --git a/centos_pkg_dirs b/centos_pkg_dirs index 21613eb8e..97b374028 100644 --- a/centos_pkg_dirs +++ b/centos_pkg_dirs @@ -93,7 +93,6 @@ security/tboot networking/mellanox/libibverbs kernel/kernel-modules/mlnx-ofa_kernel networking/mellanox/rdma-core -config/puppet-modules/openstack/puppet-memcached-3.0.2 config/puppet-modules/openstack/puppet-horizon-9.5.0 config/puppet-modules/openstack/puppet-swift-11.3.0 monitoring/collectd-extensions diff --git a/config/puppet-modules/openstack/puppet-memcached-3.0.2/centos/build_srpm.data b/config/puppet-modules/openstack/puppet-memcached-3.0.2/centos/build_srpm.data deleted file mode 100644 index 8aeb55368..000000000 --- a/config/puppet-modules/openstack/puppet-memcached-3.0.2/centos/build_srpm.data +++ /dev/null @@ -1 +0,0 @@ -TIS_PATCH_VER=1 diff --git a/config/puppet-modules/openstack/puppet-memcached-3.0.2/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/config/puppet-modules/openstack/puppet-memcached-3.0.2/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch deleted file mode 100644 index 913788ef1..000000000 --- a/config/puppet-modules/openstack/puppet-memcached-3.0.2/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c5127c3365ebcf6124b4e6fad15cccd7ea2e7f20 Mon Sep 17 00:00:00 2001 -From: Jack Ding -Date: Tue, 8 May 2018 13:08:38 -0400 -Subject: [PATCH] Update package versioning for TIS format - ---- - SPECS/puppet-memcached.spec | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/SPECS/puppet-memcached.spec b/SPECS/puppet-memcached.spec -index 8df048d..6b69f32 100644 ---- a/SPECS/puppet-memcached.spec -+++ b/SPECS/puppet-memcached.spec -@@ -8,7 +8,7 @@ - - Name: puppet-memcached - Version: 3.0.2 --Release: 1%{?alphatag}%{?dist} -+Release: 1.el7%{?_tis_dist}.%{tis_patch_ver} - Summary: Manage memcached via Puppet - License: ASL 2.0 - --- -1.8.3.1 - diff --git a/config/puppet-modules/openstack/puppet-memcached-3.0.2/centos/meta_patches/PATCH_ORDER b/config/puppet-modules/openstack/puppet-memcached-3.0.2/centos/meta_patches/PATCH_ORDER deleted file mode 100644 index 91f9a80ea..000000000 --- a/config/puppet-modules/openstack/puppet-memcached-3.0.2/centos/meta_patches/PATCH_ORDER +++ /dev/null @@ -1 +0,0 @@ -0001-Update-package-versioning-for-TIS-format.patch diff --git a/config/puppet-modules/openstack/puppet-memcached-3.0.2/centos/srpm_path b/config/puppet-modules/openstack/puppet-memcached-3.0.2/centos/srpm_path deleted file mode 100644 index c026f650f..000000000 --- a/config/puppet-modules/openstack/puppet-memcached-3.0.2/centos/srpm_path +++ /dev/null @@ -1 +0,0 @@ -mirror:Source/puppet-memcached-3.0.2-1.adf8b63git.el7.src.rpm