From 343f70e7cf99db31b618e15bc401bc19116c277a Mon Sep 17 00:00:00 2001 From: "Swapnil Kulkarni (coolsvap)" Date: Tue, 12 Apr 2016 21:59:49 +0530 Subject: [PATCH] Update Nova dockerfiles for formatting Change-Id: Ie3731732f2026cd0d3a1bda2925be2b6479ae5c7 Partial-Bug:#1569417 --- docker/nova/nova-api/Dockerfile.j2 | 3 ++- docker/nova/nova-base/Dockerfile.j2 | 3 ++- docker/nova/nova-conductor/Dockerfile.j2 | 3 ++- docker/nova/nova-consoleauth/Dockerfile.j2 | 3 ++- docker/nova/nova-network/Dockerfile.j2 | 3 ++- docker/nova/nova-scheduler/Dockerfile.j2 | 3 ++- docker/nova/nova-spicehtml5proxy/Dockerfile.j2 | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/docker/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2 index 023331e543..4d127ff78e 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 1d09ec199a..80b1e6b317 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 98cab0695d..0a11d8c814 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 dedcf8f1fa..be33edc09f 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 251924f5c5..f956aaa726 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 24443038d4..57ba7ca63c 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 e0d194795c..09d25fe207 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'] %}