aboutsummaryrefslogtreecommitdiff
path: root/docker/nova
diff options
context:
space:
mode:
authorSwapnil Kulkarni (coolsvap) <me@coolsvap.net>2016-04-12 21:59:49 +0530
committerSwapnil Kulkarni (coolsvap) <me@coolsvap.net>2016-04-13 15:02:53 +0530
commit343f70e7cf99db31b618e15bc401bc19116c277a (patch)
treec0ed074d456a1886d511e3902116c76dccb0c674 /docker/nova
parent3a35abe4a1c64f1a3a35ba1370060228f7e8be1a (diff)
downloadkolla-343f70e7cf99db31b618e15bc401bc19116c277a.tar.gz
kolla-343f70e7cf99db31b618e15bc401bc19116c277a.zip
Update Nova dockerfiles for formatting
Change-Id: Ie3731732f2026cd0d3a1bda2925be2b6479ae5c7 Partial-Bug:#1569417
Diffstat (limited to 'docker/nova')
-rw-r--r--docker/nova/nova-api/Dockerfile.j23
-rw-r--r--docker/nova/nova-base/Dockerfile.j23
-rw-r--r--docker/nova/nova-conductor/Dockerfile.j23
-rw-r--r--docker/nova/nova-consoleauth/Dockerfile.j23
-rw-r--r--docker/nova/nova-network/Dockerfile.j23
-rw-r--r--docker/nova/nova-scheduler/Dockerfile.j23
-rw-r--r--docker/nova/nova-spicehtml5proxy/Dockerfile.j23
7 files changed, 14 insertions, 7 deletions
diff --git a/docker/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2
index 023331e54..4d127ff78 100644
--- a/docker/nova/nova-api/Dockerfile.j2
+++ b/docker/nova/nova-api/Dockerfile.j2
@@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-RUN yum -y install openstack-nova-api \
+RUN yum -y install \
+ openstack-nova-api \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}
diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2
index 1d09ec199..80b1e6b31 100644
--- a/docker/nova/nova-base/Dockerfile.j2
+++ b/docker/nova/nova-base/Dockerfile.j2
@@ -25,7 +25,8 @@ RUN apt-get install -y --no-install-recommends \
{% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-RUN yum -y install bridge-utils \
+RUN yum -y install \
+ bridge-utils \
openvswitch \
&& yum clean all
diff --git a/docker/nova/nova-conductor/Dockerfile.j2 b/docker/nova/nova-conductor/Dockerfile.j2
index 98cab0695..0a11d8c81 100644
--- a/docker/nova/nova-conductor/Dockerfile.j2
+++ b/docker/nova/nova-conductor/Dockerfile.j2
@@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-RUN yum -y install openstack-nova-conductor \
+RUN yum -y install \
+ openstack-nova-conductor \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}
diff --git a/docker/nova/nova-consoleauth/Dockerfile.j2 b/docker/nova/nova-consoleauth/Dockerfile.j2
index dedcf8f1f..be33edc09 100644
--- a/docker/nova/nova-consoleauth/Dockerfile.j2
+++ b/docker/nova/nova-consoleauth/Dockerfile.j2
@@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-RUN yum -y install openstack-nova-console \
+RUN yum -y install \
+ openstack-nova-console \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}
diff --git a/docker/nova/nova-network/Dockerfile.j2 b/docker/nova/nova-network/Dockerfile.j2
index 251924f5c..f956aaa72 100644
--- a/docker/nova/nova-network/Dockerfile.j2
+++ b/docker/nova/nova-network/Dockerfile.j2
@@ -20,7 +20,8 @@ RUN apt-get install -y --no-install-recommends \
{% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-RUN yum -y install initscripts \
+RUN yum -y install \
+ initscripts \
&& yum clean all
{% endif %}
diff --git a/docker/nova/nova-scheduler/Dockerfile.j2 b/docker/nova/nova-scheduler/Dockerfile.j2
index 24443038d..57ba7ca63 100644
--- a/docker/nova/nova-scheduler/Dockerfile.j2
+++ b/docker/nova/nova-scheduler/Dockerfile.j2
@@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-RUN yum -y install openstack-nova-scheduler \
+RUN yum -y install \
+ openstack-nova-scheduler \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}
diff --git a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2
index e0d194795..09d25fe20 100644
--- a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2
+++ b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2
@@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-RUN yum -y install openstack-nova-spicehtml5proxy \
+RUN yum -y install \
+ openstack-nova-spicehtml5proxy \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}