From 7da4e92c3ae699755d407fc7124de15abc12c423 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Tue, 24 Feb 2015 00:04:07 -0700 Subject: [PATCH] All of the agents try to install yum The operation is meant to clean the cache, but instead the agents are running "yum install yum" which is incorrect. Change-Id: I8e207e93bb10361a7afbbfd02ab11d12ad1cd77c --- docker/neutron/agents/dhcp/Dockerfile | 3 +-- docker/neutron/agents/l3/Dockerfile | 3 +-- docker/neutron/agents/linux-bridge/Dockerfile | 3 +-- docker/neutron/agents/metadata/Dockerfile | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/docker/neutron/agents/dhcp/Dockerfile b/docker/neutron/agents/dhcp/Dockerfile index 021940c9c5..6ce7852b18 100644 --- a/docker/neutron/agents/dhcp/Dockerfile +++ b/docker/neutron/agents/dhcp/Dockerfile @@ -2,8 +2,7 @@ FROM kollaglue/fedora-rdo-neutron-base:l3_ovs_wip MAINTAINER Kolla Project (https://launchpad.net/kolla) # Install required packages -RUN yum install -y openstack-neutron \ - yum clean all; +RUN yum install -y openstack-neutron && yum clean all # Add required scripts ADD ./start.sh /start.sh diff --git a/docker/neutron/agents/l3/Dockerfile b/docker/neutron/agents/l3/Dockerfile index 021940c9c5..9edb81361b 100644 --- a/docker/neutron/agents/l3/Dockerfile +++ b/docker/neutron/agents/l3/Dockerfile @@ -2,8 +2,7 @@ FROM kollaglue/fedora-rdo-neutron-base:l3_ovs_wip MAINTAINER Kolla Project (https://launchpad.net/kolla) # Install required packages -RUN yum install -y openstack-neutron \ - yum clean all; +RUN yum install -y openstack-neutron && yum clean all; # Add required scripts ADD ./start.sh /start.sh diff --git a/docker/neutron/agents/linux-bridge/Dockerfile b/docker/neutron/agents/linux-bridge/Dockerfile index 40e4d17a93..c2b60c9a9b 100644 --- a/docker/neutron/agents/linux-bridge/Dockerfile +++ b/docker/neutron/agents/linux-bridge/Dockerfile @@ -3,8 +3,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) # Install required packages RUN yum install -y openstack-neutron \ - openstack-neutron-linuxbridge \ - yum clean all; + openstack-neutron-linuxbridge && yum clean all; # Add required scripts ADD ./start.sh /start.sh diff --git a/docker/neutron/agents/metadata/Dockerfile b/docker/neutron/agents/metadata/Dockerfile index 021940c9c5..9edb81361b 100644 --- a/docker/neutron/agents/metadata/Dockerfile +++ b/docker/neutron/agents/metadata/Dockerfile @@ -2,8 +2,7 @@ FROM kollaglue/fedora-rdo-neutron-base:l3_ovs_wip MAINTAINER Kolla Project (https://launchpad.net/kolla) # Install required packages -RUN yum install -y openstack-neutron \ - yum clean all; +RUN yum install -y openstack-neutron && yum clean all; # Add required scripts ADD ./start.sh /start.sh