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/nova | |
| 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/nova')
| -rw-r--r-- | docker/nova/nova-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/nova/nova-compute-ironic/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/nova/nova-conductor/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-consoleauth/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-network/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-novncproxy/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-scheduler/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-spicehtml5proxy/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-ssh/Dockerfile.j2 | 2 |
12 files changed, 14 insertions, 14 deletions
diff --git a/docker/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2 index 4d127ff78..485efb1d1 100644 --- a/docker/nova/nova-api/Dockerfile.j2 +++ b/docker/nova/nova-api/Dockerfile.j2 @@ -10,7 +10,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 \ nova-api \ python-memcache \ && apt-get clean diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index 80b1e6b31..f0d18e3d7 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-base/Dockerfile.j2 @@ -14,7 +14,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 \ nova-common \ python-nova \ bridge-utils \ @@ -32,7 +32,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 \ iptables \ ebtables \ dnsmasq \ diff --git a/docker/nova/nova-compute-ironic/Dockerfile.j2 b/docker/nova/nova-compute-ironic/Dockerfile.j2 index f8c9c518d..268cb6710 100644 --- a/docker/nova/nova-compute-ironic/Dockerfile.j2 +++ b/docker/nova/nova-compute-ironic/Dockerfile.j2 @@ -10,7 +10,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 \ nova-compute \ && apt-get clean diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 72709cd94..8e81f725d 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -18,7 +18,7 @@ RUN yum -y install \ {% elif base_distro in ['ubuntu'] %} # ironic as workaround https://bugs.launchpad.net/packstack/+bug/1430388 -RUN apt-get install -y --no-install-recommends \ +RUN apt-get -y install --no-install-recommends \ nova-compute \ openvswitch-switch \ sysfsutils \ @@ -50,7 +50,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 \ libvirt-dev \ qemu-utils \ ceph-common \ diff --git a/docker/nova/nova-conductor/Dockerfile.j2 b/docker/nova/nova-conductor/Dockerfile.j2 index 0a11d8c81..e53ba7e8f 100644 --- a/docker/nova/nova-conductor/Dockerfile.j2 +++ b/docker/nova/nova-conductor/Dockerfile.j2 @@ -10,7 +10,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 \ nova-conductor \ && apt-get clean diff --git a/docker/nova/nova-consoleauth/Dockerfile.j2 b/docker/nova/nova-consoleauth/Dockerfile.j2 index be33edc09..c2c04783b 100644 --- a/docker/nova/nova-consoleauth/Dockerfile.j2 +++ b/docker/nova/nova-consoleauth/Dockerfile.j2 @@ -10,7 +10,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 \ nova-consoleauth \ python-memcache \ && apt-get clean diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 65f3dedf6..cc48d0363 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -17,7 +17,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 \ ceph-common \ libvirt-bin \ dmidecode \ diff --git a/docker/nova/nova-network/Dockerfile.j2 b/docker/nova/nova-network/Dockerfile.j2 index f956aaa72..6b78b8ba4 100644 --- a/docker/nova/nova-network/Dockerfile.j2 +++ b/docker/nova/nova-network/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 \ nova-network \ && apt-get clean diff --git a/docker/nova/nova-novncproxy/Dockerfile.j2 b/docker/nova/nova-novncproxy/Dockerfile.j2 index 90d6934a6..ee1d6bf68 100644 --- a/docker/nova/nova-novncproxy/Dockerfile.j2 +++ b/docker/nova/nova-novncproxy/Dockerfile.j2 @@ -11,7 +11,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 \ nova-novncproxy \ && apt-get clean diff --git a/docker/nova/nova-scheduler/Dockerfile.j2 b/docker/nova/nova-scheduler/Dockerfile.j2 index 57ba7ca63..ba6a3bf90 100644 --- a/docker/nova/nova-scheduler/Dockerfile.j2 +++ b/docker/nova/nova-scheduler/Dockerfile.j2 @@ -10,7 +10,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 \ nova-scheduler \ && apt-get clean diff --git a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 index 09d25fe20..2033e24cf 100644 --- a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 +++ b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 @@ -10,7 +10,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 \ nova-spiceproxy \ && apt-get clean diff --git a/docker/nova/nova-ssh/Dockerfile.j2 b/docker/nova/nova-ssh/Dockerfile.j2 index 7bc859ef1..132bd8f85 100644 --- a/docker/nova/nova-ssh/Dockerfile.j2 +++ b/docker/nova/nova-ssh/Dockerfile.j2 @@ -9,7 +9,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 \ openssh-server \ && apt-get clean \ && mkdir -p /var/run/sshd \ |
