openstack/kolla-ansible
Code Issues Proposed changes

Merge "Update Trove dockerfiles for formatting"

Browse Source
This commit is contained in:
Jenkins 2016-04-13 08:42:04 +00:00 committed by Gerrit Code Review
commit 03b64058a2
4 changed files with 8 additions and 4 deletions
docker/trove
trove-api
Dockerfile.j2
trove-conductor
Dockerfile.j2
trove-guestagent
Dockerfile.j2
trove-taskmanager
Dockerfile.j2

3
docker/trove/trove-api/Dockerfile.j2

@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum install -y openstack-trove-api \
RUN yum -y install \
openstack-trove-api \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}

3
docker/trove/trove-conductor/Dockerfile.j2

@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum install -y openstack-trove-conductor \
RUN yum -y install \
openstack-trove-conductor \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}

3
docker/trove/trove-guestagent/Dockerfile.j2

@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum install -y openstack-trove-guestagent \
RUN yum -y install \
openstack-trove-guestagent \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}

3
docker/trove/trove-taskmanager/Dockerfile.j2

@ -4,7 +4,8 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum install -y openstack-trove-taskmanager \
RUN yum -y install \
openstack-trove-taskmanager \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}