aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-02-24 00:04:07 -0700
committerMartin André <martin.andre@kvhasia.com>2015-02-24 07:09:18 +0000
commit7da4e92c3ae699755d407fc7124de15abc12c423 (patch)
treee3588e3823af143e9b82f4e8ca9a2e39e5f25a8c
parent47d36732eaa3e40d1c6a3c6710e779347b102a33 (diff)
downloadkolla-7da4e92c3ae699755d407fc7124de15abc12c423.tar.gz
kolla-7da4e92c3ae699755d407fc7124de15abc12c423.zip
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
-rw-r--r--docker/neutron/agents/dhcp/Dockerfile3
-rw-r--r--docker/neutron/agents/l3/Dockerfile3
-rw-r--r--docker/neutron/agents/linux-bridge/Dockerfile3
-rw-r--r--docker/neutron/agents/metadata/Dockerfile3
4 files changed, 4 insertions, 8 deletions
diff --git a/docker/neutron/agents/dhcp/Dockerfile b/docker/neutron/agents/dhcp/Dockerfile
index 021940c9c..6ce7852b1 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 021940c9c..9edb81361 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 40e4d17a9..c2b60c9a9 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 021940c9c..9edb81361 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