openstack/kolla-ansible
Code Issues Proposed changes

Update designate dockerfile for formatting

Browse Source 
Change-Id: I6d87fd19db433023d3d466e21e6dff27d7bf3927
Partial-Bug:#1569417
This commit is contained in:
Swapnil Kulkarni (coolsvap) 2016-04-21 17:10:12 +05:30
parent a861450fd2
commit 2fdd7e4ddd
7 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/designate/designate-api/Dockerfile.j2
View File

@ -4,7 +4,7 @@ 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 \ RUN yum -y install \
openstack-designate-api \ openstack-designate-api \
&& yum clean all && yum clean all

3
docker/designate/designate-backend-bind9/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 install -y bind \ RUN yum -y install \
bind \
&& yum clean all \ && yum clean all \
&& mkdir -p /var/lib/kolla/ \ && mkdir -p /var/lib/kolla/ \
&& cp -pr /var/named /var/lib/kolla/var-named && cp -pr /var/named /var/lib/kolla/var-named

2
docker/designate/designate-base/Dockerfile.j2
View File

@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
# is needed in all services. This is probably a packaging bug. We do # is needed in all services. This is probably a packaging bug. We do
# need the complete policy file because of some of the containers' # need the complete policy file because of some of the containers'
# requiring it. Remove the package when the file is moved though. # requiring it. Remove the package when the file is moved though.
RUN yum install -y \ RUN yum -y install \
openstack-designate-api \ openstack-designate-api \
openstack-designate-common \ openstack-designate-common \
python-tooz \ python-tooz \

3
docker/designate/designate-central/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 install -y openstack-designate-central \ RUN yum -y install \
openstack-designate-central \
&& yum clean all && yum clean all
{% elif base_distro in ['ubuntu']%} {% elif base_distro in ['ubuntu']%}

3
docker/designate/designate-mdns/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 install -y openstack-designate-mdns \ RUN yum -y install \
openstack-designate-mdns \
&& yum clean all && yum clean all
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}

6
docker/designate/designate-poolmanager/Dockerfile.j2
View File

@ -5,16 +5,16 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
# The bind9 package here is only to provide the rndc binary. # The bind9 package here is only to provide the rndc binary.
RUN yum install -y \ RUN yum -y install \
openstack-designate-pool-manager \
bind \ bind \
openstack-designate-pool-manager \
&& yum clean all && yum clean all
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
RUN apt-get install -y --no-install-recommends \ RUN apt-get install -y --no-install-recommends \
designate-pool-manager \
bind9 \ bind9 \
designate-pool-manager \
&& apt-get clean && apt-get clean
{% endif %} {% endif %}

2
docker/designate/designate-sink/Dockerfile.j2
View File

@ -4,7 +4,7 @@ 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 \ RUN yum -y install \
openstack-designate-sink \ openstack-designate-sink \
python-designateclient \ python-designateclient \
&& yum clean all && yum clean all