diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-04-13 08:57:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-04-13 08:57:36 +0000 |
| commit | b2a3d3bb8b6257d9787a82cddbbcaa7f1d62dc9c (patch) | |
| tree | b47a216eb6a0d59d4e769c6923306c6f5ad45346 /docker | |
| parent | f40d4dee80cb8cda836acc10bfffd7aa21d61da0 (diff) | |
| parent | 22c9cb3a42c947800c7f2f4969a0062fec2992d1 (diff) | |
| download | kolla-b2a3d3bb8b6257d9787a82cddbbcaa7f1d62dc9c.tar.gz kolla-b2a3d3bb8b6257d9787a82cddbbcaa7f1d62dc9c.zip | |
Merge "Update Neutron dockerfiles for formatting"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 index dddc8b569..2e9c47638 100644 --- a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 @@ -5,7 +5,7 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} # Install required packages -RUN yum install -y \ +RUN yum -y install \ ebtables \ openstack-neutron-linuxbridge \ && yum clean all @@ -22,7 +22,7 @@ RUN apt-get install -y --no-install-recommends \ {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} # Install required packages -RUN yum install -y \ +RUN yum -y install \ ebtables \ bridge-utils \ && yum clean all diff --git a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 index 4bac50e18..ceb15e1a5 100644 --- a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 @@ -5,7 +5,7 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} # Install required packages -RUN yum install -y \ +RUN yum -y install \ openstack-neutron-openvswitch \ openvswitch \ && yum clean all |