openstack/kolla-ansible
Code Issues Proposed changes

Merge "Update Nova dockerfiles for formatting"

Browse Source
This commit is contained in:
Jenkins 2016-04-19 10:45:00 +00:00 committed by Gerrit Code Review
commit b391bc78e7
7 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/nova/nova-api/Dockerfile.j2
View File

@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% 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 && yum clean all
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}

3
docker/nova/nova-base/Dockerfile.j2
View File

@ -25,7 +25,8 @@ RUN apt-get install -y --no-install-recommends \
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install bridge-utils \ RUN yum -y install \
bridge-utils \
openvswitch \ openvswitch \
&& yum clean all && yum clean all

3
docker/nova/nova-conductor/Dockerfile.j2
View File

@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% 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 && yum clean all
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}

3
docker/nova/nova-consoleauth/Dockerfile.j2
View File

@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% 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 && yum clean all
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}

3
docker/nova/nova-network/Dockerfile.j2
View File

@ -20,7 +20,8 @@ RUN apt-get install -y --no-install-recommends \
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install initscripts \ RUN yum -y install \
initscripts \
&& yum clean all && yum clean all
{% endif %} {% endif %}

3
docker/nova/nova-scheduler/Dockerfile.j2
View File

@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% 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 && yum clean all
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}

3
docker/nova/nova-spicehtml5proxy/Dockerfile.j2
View File

@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% 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 && yum clean all
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}