From d10cc4e6be43f9569a448759e415264521126903 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Wed, 18 Apr 2018 11:58:03 -0400 Subject: [PATCH] Exclude epel element for diskimage-builder In I2ffdd9f615ae6b00428c17249e4f216774991b99 we reworked the logic in pip-and-virtualenv element to add epel as a dependency. We need to now exclude epel since is it a dependency. Change-Id: I43562f960cc100d4ec19b8a5e72c5929e24619ba Signed-off-by: Paul Belanger (cherry picked from commit 1f3da02ac1d43a7a481f50678d14cd75b2ed37bc) --- json-files/centos-7-undercloud-packages.json | 1 + json-files/rhel-7-undercloud-packages.json | 1 + 2 files changed, 2 insertions(+) diff --git a/json-files/centos-7-undercloud-packages.json b/json-files/centos-7-undercloud-packages.json index 1a6bba409..652d0bbf1 100644 --- a/json-files/centos-7-undercloud-packages.json +++ b/json-files/centos-7-undercloud-packages.json @@ -16,6 +16,7 @@ ], "exclude-element": [ "pip-and-virtualenv", + "epel", "os-collect-config", "svc-map", "pip-manifest", diff --git a/json-files/rhel-7-undercloud-packages.json b/json-files/rhel-7-undercloud-packages.json index 1a6bba409..652d0bbf1 100644 --- a/json-files/rhel-7-undercloud-packages.json +++ b/json-files/rhel-7-undercloud-packages.json @@ -16,6 +16,7 @@ ], "exclude-element": [ "pip-and-virtualenv", + "epel", "os-collect-config", "svc-map", "pip-manifest",