diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-04 14:19:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-04 14:19:43 +0000 |
| commit | 35ea22ee99016328fbe9a68abe946e8087f425a6 (patch) | |
| tree | 79dd4d43295c8c502a90fae93fb46ea13dc939cf /docker/designate | |
| parent | 326b29f363596e6b63ebdf2643d22b2b642aecea (diff) | |
| parent | 6992049323b271bf3856548f4a4d61482f5c4617 (diff) | |
| download | kolla-35ea22ee99016328fbe9a68abe946e8087f425a6.tar.gz kolla-35ea22ee99016328fbe9a68abe946e8087f425a6.zip | |
Merge "Add 'rhel' for RPM distros"
Diffstat (limited to 'docker/designate')
7 files changed, 8 insertions, 7 deletions
diff --git a/docker/designate/designate-api/Dockerfile.j2 b/docker/designate/designate-api/Dockerfile.j2 index 75f4b06ee..1e2e28e8f 100644 --- a/docker/designate/designate-api/Dockerfile.j2 +++ b/docker/designate/designate-api/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-designate-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum install -y \ openstack-designate-api \ diff --git a/docker/designate/designate-backend-bind9/Dockerfile.j2 b/docker/designate/designate-backend-bind9/Dockerfile.j2 index 06f86c043..3b47ff72e 100644 --- a/docker/designate/designate-backend-bind9/Dockerfile.j2 +++ b/docker/designate/designate-backend-bind9/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-designate-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum install -y bind \ && yum clean all \ diff --git a/docker/designate/designate-base/Dockerfile.j2 b/docker/designate/designate-base/Dockerfile.j2 index 340b98c4d..84e033c50 100644 --- a/docker/designate/designate-base/Dockerfile.j2 +++ b/docker/designate/designate-base/Dockerfile.j2 @@ -2,7 +2,8 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + # Install designate-api because of /etc/designate/policy.json, which # is needed in all services. This is probably a packaging bug. We do diff --git a/docker/designate/designate-central/Dockerfile.j2 b/docker/designate/designate-central/Dockerfile.j2 index 771ff3c68..3c4309999 100644 --- a/docker/designate/designate-central/Dockerfile.j2 +++ b/docker/designate/designate-central/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-designate-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum install -y \ openstack-designate-central \ diff --git a/docker/designate/designate-mdns/Dockerfile.j2 b/docker/designate/designate-mdns/Dockerfile.j2 index cc5f5fb89..49d7fa781 100644 --- a/docker/designate/designate-mdns/Dockerfile.j2 +++ b/docker/designate/designate-mdns/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-designate-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum install -y openstack-designate-mdns \ && yum clean all diff --git a/docker/designate/designate-poolmanager/Dockerfile.j2 b/docker/designate/designate-poolmanager/Dockerfile.j2 index 0fc968b90..35f99c2bf 100644 --- a/docker/designate/designate-poolmanager/Dockerfile.j2 +++ b/docker/designate/designate-poolmanager/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-designate-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} # The bind9 package here is only to provide the rndc binary. RUN yum install -y \ diff --git a/docker/designate/designate-sink/Dockerfile.j2 b/docker/designate/designate-sink/Dockerfile.j2 index c0ea23b2d..1d52a282b 100644 --- a/docker/designate/designate-sink/Dockerfile.j2 +++ b/docker/designate/designate-sink/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-designate-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum install -y \ openstack-designate-sink \ |
