Skip to content
Snippets Groups Projects
Commit b391bc78 authored by Jenkins's avatar Jenkins Committed by Gerrit Code Review
Browse files

Merge "Update Nova dockerfiles for formatting"

parents 0d87a237 343f70e7
No related branches found
No related tags found
No related merge requests found
...@@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }} ...@@ -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'] %}
......
...@@ -25,7 +25,8 @@ RUN apt-get install -y --no-install-recommends \ ...@@ -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
......
...@@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }} ...@@ -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'] %}
......
...@@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }} ...@@ -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'] %}
......
...@@ -20,7 +20,8 @@ RUN apt-get install -y --no-install-recommends \ ...@@ -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 %}
......
...@@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }} ...@@ -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'] %}
......
...@@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }} ...@@ -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'] %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment