From 962e48970a719c893ed44bfc948d1f8370e6679a Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Mon, 1 Jun 2015 20:15:55 -0700 Subject: [PATCH] Make crux compatible with delorean packaging The previous version of crus 6-1 installed pbr hooks. This is incompatible with CentOS RDO. Remove the requirements.txt file from the RPM that is installed. This required placing the files in a new COPRS repository. Since Lars no longer contributes to Kolla, I imported his src rpm, made the necessary adjustments, and created a new COPRS repo for it. The result of the PBR hooks is that any container that ran crux would fail with a distribution error about argparse not being present when it was present. Change-Id: Ibdbccd9e0dd5aeb6d6292bd633b9d2dde8c7b4ce Closes-bug: #1460886 --- docker/centos/binary/centos-binary-base/Dockerfile | 2 +- docker/centos/binary/fedora-binary-base/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/centos/binary/centos-binary-base/Dockerfile b/docker/centos/binary/centos-binary-base/Dockerfile index 0043ed3037..c929d7a55b 100644 --- a/docker/centos/binary/centos-binary-base/Dockerfile +++ b/docker/centos/binary/centos-binary-base/Dockerfile @@ -7,7 +7,7 @@ RUN yum install -y https://rdoproject.org/repos/openstack-kilo/rdo-release-kilo. # This repository provides latest packages built from trunk master into RPMs RUN curl http://trunk.rdoproject.org/centos70/current/delorean.repo -o /etc/yum.repos.d/delorean-current.repo # This repository provides crux which permits idempotent operation of RDO -RUN curl https://copr.fedoraproject.org/coprs/larsks/crux/repo/epel-7/larsks-crux-epel-7.repo -o /etc/yum.repos.d/larsks-crux-epel-7.repo +RUN curl https://copr.fedoraproject.org/coprs/sdake/crux/repo/epel-7/sdake-crux-epel-7.repo -o /etc/yum.repos.d/sdake-crux-epel-7.repo # This repository turns off auth in PAM so we can operate on Ubuntu 14.04 RUN curl https://copr.fedoraproject.org/coprs/sdake/pam.noaudit/repo/epel-7/sdake-pam.noaudit-epel-7.repo -o /etc/yum.repos.d/sdake-pam.noaudit-epel-7.repo diff --git a/docker/centos/binary/fedora-binary-base/Dockerfile b/docker/centos/binary/fedora-binary-base/Dockerfile index 5dff0dfdfc..285e128e90 100644 --- a/docker/centos/binary/fedora-binary-base/Dockerfile +++ b/docker/centos/binary/fedora-binary-base/Dockerfile @@ -4,8 +4,8 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) # Set up repositories RUN yum install -y https://rdo.fedorapeople.org/rdo-release.rpm RUN yum -y install dnf dnf-plugins-core && yum clean all -RUN dnf copr enable -y larsks/crux -run dnf copr enable -y sdake/pam.noaudit +RUN dnf copr enable -y sdake/crux +RUN dnf copr enable -y sdake/pam.noaudit # Update packages