diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-04-19 10:45:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-04-19 10:45:01 +0000 |
| commit | b391bc78e717c4922ab7dbb60de5fc912e63f8f5 (patch) | |
| tree | 81a17c29bbd0d0f67d5d1f54f62d757f5e46b619 /docker | |
| parent | 0d87a2372baa3d54887f22a7d4489a3c3efcd94a (diff) | |
| parent | 343f70e7cf99db31b618e15bc401bc19116c277a (diff) | |
| download | kolla-b391bc78e717c4922ab7dbb60de5fc912e63f8f5.tar.gz kolla-b391bc78e717c4922ab7dbb60de5fc912e63f8f5.zip | |
Merge "Update Nova dockerfiles for formatting"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/nova/nova-api/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/nova/nova-base/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/nova/nova-conductor/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/nova/nova-consoleauth/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/nova/nova-network/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/nova/nova-scheduler/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | 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 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'] %} |
