From 3c67de5d66f9b32c066703ca0037c0db98ccf75c Mon Sep 17 00:00:00 2001 From: David Moreau Simard Date: Mon, 17 Jul 2017 22:51:01 +0000 Subject: [PATCH] Revert "Remove EPEL in TripleO's Kolla template_overrides" I didn't test this properly before submitting it, there are other overrides to do. Because of this patch, containers are no longer building from scratch so let's revert it for now. I'll follow up with a full working overrides in https://review.openstack.org/#/c/484444/. This reverts commit b43e212b3bb8ce4cd3cd50f4bf4e97135e43a934. Change-Id: Id28eb9be59f89e5df9778c0831c83381a523c7d7 --- container-images/tripleo_kolla_template_overrides.j2 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/container-images/tripleo_kolla_template_overrides.j2 b/container-images/tripleo_kolla_template_overrides.j2 index 76b876024..04f5e00f3 100644 --- a/container-images/tripleo_kolla_template_overrides.j2 +++ b/container-images/tripleo_kolla_template_overrides.j2 @@ -5,10 +5,6 @@ {% set base_yum_url_packages_override = [] %} {% set base_yum_repo_keys_override = [] %} -# Remove EPEL and the dependency requiring it -{% set base_centos_yum_repo_packages_remove = ['epel-release'] %} -{% set cinder_volume_packages_remove = ['scsi-target-utils'] %} - # This installs the puppet dependency in the base container and includes helper scripts # Rsync is required for docker-puppet.py to move the generated config to /var/lib/config-data # Cron is required by multiple services