openstack/kolla-ansible
Code Issues Proposed changes

Merge "Update Neutron dockerfiles for formatting"

Browse Source
This commit is contained in:
Jenkins 2016-04-13 08:57:36 +00:00 committed by Gerrit Code Review
commit b2a3d3bb8b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2
View File

@ -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

2
docker/neutron/neutron-openvswitch-agent/Dockerfile.j2
View File

@ -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