From 1591d5c510c0e04da73a1dce406a67988bcb786e Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Tue, 14 Nov 2017 15:08:03 +1100 Subject: [PATCH] Don't install centos-release-openstack-ocata This was brought in with puppet work in Ia9c45b762eea9f2989c9c63fb944b9e5e1f17ed2 but we do not want it in the base centos 7 image. bindep-fallback packages relying on it have been removed with Iab9495bd381b135e8a0f2e8f35e51a9218cf8f40. I have done a local build with this and there's no other hidden dependencies relying on this within the image creation AFAICS. Change-Id: I747c2b8754effbc6ec82af3bf7543fd9599a6c14 --- nodepool/elements/infra-package-needs/package-installs.yaml | 1 - nodepool/elements/infra-package-needs/pkg-map | 4 ---- 2 files changed, 5 deletions(-) diff --git a/nodepool/elements/infra-package-needs/package-installs.yaml b/nodepool/elements/infra-package-needs/package-installs.yaml index a87f5ec08b..971c21fdff 100644 --- a/nodepool/elements/infra-package-needs/package-installs.yaml +++ b/nodepool/elements/infra-package-needs/package-installs.yaml @@ -28,7 +28,6 @@ iproute2: dnsutils: haveged: iptables: -centos-release-openstack-ocata: redhat-rpm-config: redhat-lsb-core: curl: diff --git a/nodepool/elements/infra-package-needs/pkg-map b/nodepool/elements/infra-package-needs/pkg-map index aa193ce106..b8df5be534 100644 --- a/nodepool/elements/infra-package-needs/pkg-map +++ b/nodepool/elements/infra-package-needs/pkg-map @@ -22,9 +22,6 @@ "tox": "dev-python/tox", "traceroute": "net-analyzer/traceroute", "uuid-runtime": "" - }, - "centos": { - "centos-release-openstack-ocata": "centos-release-openstack-ocata" } }, "family": { @@ -59,7 +56,6 @@ "curl": "curl", "iptables": "iptables-persistent", "gentoolkit": "", - "centos-release-openstack-ocata": "", "redhat-rpm-config": "", "redhat-lsb-core": "", "python-xml": "",