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

Merge "Update Cinder dockerfiles for formatting"

parents f36d1c58 62bffa74
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 install -y python-keystone \ RUN yum -y install \
python-keystone \
&& 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-cinder \ RUN yum -y install \
openstack-cinder \
python-automaton \ python-automaton \
lvm2 \ lvm2 \
ceph-common \ ceph-common \
......
...@@ -3,7 +3,7 @@ MAINTAINER {{ maintainer }} ...@@ -3,7 +3,7 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum install -y \ RUN yum -y install \
scsi-target-utils \ scsi-target-utils \
&& yum clean all && yum clean all
......
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