From 54411f40e3cf76744e553abbe56c531fae854410 Mon Sep 17 00:00:00 2001 From: Ryan Hallisey Date: Mon, 6 Jul 2015 08:20:32 -0400 Subject: [PATCH] Add oslo package into base image Add missing oslo dependency. Closes-bug: #1469891 Change-Id: Ia7b0a5bc0d59f561a1cb6cdb0a50478cad9246d4 --- docker/centos/binary/base/Dockerfile | 1 + docker/centos/binary/heat/heat-base/Dockerfile | 2 -- docker/centos/binary/neutron/neutron-base/Dockerfile | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/docker/centos/binary/base/Dockerfile b/docker/centos/binary/base/Dockerfile index 60f56aee39..d9c8d48e6d 100644 --- a/docker/centos/binary/base/Dockerfile +++ b/docker/centos/binary/base/Dockerfile @@ -72,6 +72,7 @@ RUN yum install -y \ python-oslo-config \ python-oslo-messaging \ python-oslo-rootwrap \ + python-oslo-policy \ python-paramiko \ python-passlib \ python-paste-deploy \ diff --git a/docker/centos/binary/heat/heat-base/Dockerfile b/docker/centos/binary/heat/heat-base/Dockerfile index 7321ca8a63..ebe9fa15c2 100755 --- a/docker/centos/binary/heat/heat-base/Dockerfile +++ b/docker/centos/binary/heat/heat-base/Dockerfile @@ -1,7 +1,5 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) -RUN yum -y install python-oslo-policy && yum clean all - RUN mkdir -p /opt/kolla COPY config-heat.sh /opt/kolla/config-heat.sh diff --git a/docker/centos/binary/neutron/neutron-base/Dockerfile b/docker/centos/binary/neutron/neutron-base/Dockerfile index edc8679f61..106068a21e 100644 --- a/docker/centos/binary/neutron/neutron-base/Dockerfile +++ b/docker/centos/binary/neutron/neutron-base/Dockerfile @@ -4,7 +4,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum -y install openstack-neutron \ openstack-neutron-ml2 \ python-neutron-client \ - python-oslo-policy \ - && yum clean all + && yum clean all COPY config-neutron.sh config-sudoers.sh /opt/kolla/