diff options
| author | Swapnil Kulkarni (coolsvap) <me@coolsvap.net> | 2016-05-17 10:04:59 +0530 |
|---|---|---|
| committer | Swapnil Kulkarni (coolsvap) <me@coolsvap.net> | 2016-05-26 04:09:22 +0000 |
| commit | 435b21b90d97481dacbd387a3c20993ff4e4ab39 (patch) | |
| tree | 21777293b8baa88e9b0701c5931f66b670fd0d6a /docker/neutron | |
| parent | f93739fa4fbd437236775591bbaa38d8c13d33f6 (diff) | |
| download | kolla-435b21b90d97481dacbd387a3c20993ff4e4ab39.tar.gz kolla-435b21b90d97481dacbd387a3c20993ff4e4ab39.zip | |
Update ubuntu dockerfiles for formatting
Change-Id: If4be00b937e14ec93443dcb7249cf17099d57cbe
Closes-Bug: #1569417
Diffstat (limited to 'docker/neutron')
6 files changed, 8 insertions, 8 deletions
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index f8a9f9f5b..12825c9bc 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -12,7 +12,7 @@ RUN yum -y install \ {% elif base_distro in ['ubuntu'] %} -RUN apt-get install -y --no-install-recommends \ +RUN apt-get -y install --no-install-recommends \ neutron-plugin-ml2 \ neutron-server \ openvswitch-switch \ @@ -35,7 +35,7 @@ RUN yum -y install \ {% elif base_distro in ['ubuntu', 'debian'] %} -RUN apt-get install -y --no-install-recommends \ +RUN apt-get -y install --no-install-recommends \ arping \ conntrack \ dnsmasq \ diff --git a/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 b/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 index ea5ede23c..45eb8f737 100644 --- a/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 @@ -4,7 +4,7 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['ubuntu', 'debian'] %} {% if install_type == 'binary' %} -RUN apt-get install -y --no-install-recommends \ +RUN apt-get -y install --no-install-recommends \ neutron-dhcp-agent \ && apt-get clean diff --git a/docker/neutron/neutron-l3-agent/Dockerfile.j2 b/docker/neutron/neutron-l3-agent/Dockerfile.j2 index be3087d53..a3edef6af 100644 --- a/docker/neutron/neutron-l3-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-l3-agent/Dockerfile.j2 @@ -4,7 +4,7 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['ubuntu', 'debian'] %} {% if install_type == 'binary' %} -RUN apt-get install -y --no-install-recommends \ +RUN apt-get -y install --no-install-recommends \ neutron-l3-agent \ && apt-get clean diff --git a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 index 2e9c47638..2d968b6a8 100644 --- a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 @@ -12,7 +12,7 @@ RUN yum -y install \ {% elif base_distro in ['ubuntu'] %} -RUN apt-get install -y --no-install-recommends \ +RUN apt-get -y install --no-install-recommends \ ebtables \ neutron-plugin-linuxbridge-agent \ && apt-get clean @@ -28,7 +28,7 @@ RUN yum -y install \ && yum clean all {% elif base_distro in ['ubuntu'] %} -RUN apt-get install -y \ +RUN apt-get -y install \ ebtables \ bridge-utils \ && apt-get clean diff --git a/docker/neutron/neutron-metadata-agent/Dockerfile.j2 b/docker/neutron/neutron-metadata-agent/Dockerfile.j2 index 141696b9c..99c9c6fee 100644 --- a/docker/neutron/neutron-metadata-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-metadata-agent/Dockerfile.j2 @@ -4,7 +4,7 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['ubuntu', 'debian'] %} {% if install_type == 'binary' %} -RUN apt-get install -y --no-install-recommends \ +RUN apt-get -y install --no-install-recommends \ neutron-metadata-agent \ && apt-get clean diff --git a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 index ceb15e1a5..f943543d9 100644 --- a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 @@ -12,7 +12,7 @@ RUN yum -y install \ {% elif base_distro in ['ubuntu'] %} -RUN apt-get install -y --no-install-recommends \ +RUN apt-get -y install --no-install-recommends \ openvswitch-switch \ neutron-plugin-openvswitch-agent \ && apt-get clean |