diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-04 13:39:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-04 13:39:07 +0000 |
| commit | d69ab19701a142fb654cdecb3d4fda09e098d7a8 (patch) | |
| tree | 26ae3e192aa88f123c65a2190810385c581643a7 /docker/designate | |
| parent | d25ddf87f3f74c9889e303a9e139296fe70f04dc (diff) | |
| parent | 5cd30d491435b73a1cb7a2b8981de2c1f85761c7 (diff) | |
| download | kolla-d69ab19701a142fb654cdecb3d4fda09e098d7a8.tar.gz kolla-d69ab19701a142fb654cdecb3d4fda09e098d7a8.zip | |
Merge "Remove Fedora support"
Diffstat (limited to 'docker/designate')
7 files changed, 7 insertions, 7 deletions
diff --git a/docker/designate/designate-api/Dockerfile.j2 b/docker/designate/designate-api/Dockerfile.j2 index 9b6a5bf3a..b66457826 100644 --- a/docker/designate/designate-api/Dockerfile.j2 +++ b/docker/designate/designate-api/Dockerfile.j2 @@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set designate_api_packages = ['openstack-designate-api'] %} {% elif base_distro in ['ubuntu'] %} {% set designate_api_packages = ['designate-api'] %} diff --git a/docker/designate/designate-backend-bind9/Dockerfile.j2 b/docker/designate/designate-backend-bind9/Dockerfile.j2 index b912ffacd..83aa68c73 100644 --- a/docker/designate/designate-backend-bind9/Dockerfile.j2 +++ b/docker/designate/designate-backend-bind9/Dockerfile.j2 @@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set designate_backend_bind9_packages = ['bind'] %} {{ macros.install_packages(designate_backend_bind9_packages | customizable("packages")) }} diff --git a/docker/designate/designate-base/Dockerfile.j2 b/docker/designate/designate-base/Dockerfile.j2 index fdadee6df..6cc36f639 100644 --- a/docker/designate/designate-base/Dockerfile.j2 +++ b/docker/designate/designate-base/Dockerfile.j2 @@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', '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 f2caebad1..7a29f3569 100644 --- a/docker/designate/designate-central/Dockerfile.j2 +++ b/docker/designate/designate-central/Dockerfile.j2 @@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set designate_central_packages = ['openstack-designate-central'] %} {% elif base_distro in ['ubuntu']%} {% set designate_central_packages = ['designate-central'] %} diff --git a/docker/designate/designate-mdns/Dockerfile.j2 b/docker/designate/designate-mdns/Dockerfile.j2 index a1729826f..6028bdef4 100644 --- a/docker/designate/designate-mdns/Dockerfile.j2 +++ b/docker/designate/designate-mdns/Dockerfile.j2 @@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set designate_mdns_packages = ['openstack-designate-mdns'] %} {% elif base_distro in ['ubuntu'] %} {% set designate_mdns_packages = ['designate-mdns'] %} diff --git a/docker/designate/designate-pool-manager/Dockerfile.j2 b/docker/designate/designate-pool-manager/Dockerfile.j2 index 815ceb5e8..4b9ca6f26 100644 --- a/docker/designate/designate-pool-manager/Dockerfile.j2 +++ b/docker/designate/designate-pool-manager/Dockerfile.j2 @@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} # The bind9 package here is only to provide the rndc binary. {% set designate_pool_manager_packages = [ 'bind', diff --git a/docker/designate/designate-sink/Dockerfile.j2 b/docker/designate/designate-sink/Dockerfile.j2 index 3c98d64ed..6d2e6acd3 100644 --- a/docker/designate/designate-sink/Dockerfile.j2 +++ b/docker/designate/designate-sink/Dockerfile.j2 @@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set designate_sink_packages = [ 'openstack-designate-sink', 'python-designateclient' |