Merge "Use base_package_type"

9 files changed, 23 insertions, 23 deletions

diff --git a/docker/designate/designate-api/Dockerfile.j2 b/docker/designate/designate-api/Dockerfile.j2
index 7f67ecbe0..d138d4887 100644
--- a/docker/designate/designate-api/Dockerfile.j2
+++ b/docker/designate/designate-api/Dockerfile.j2
@@ -6,9 +6,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}
-    {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+    {% if base_package_type == 'rpm' %}
        {% set designate_api_packages = ['openstack-designate-api'] %}
-    {% elif base_distro in ['debian', 'ubuntu'] %}
+    {% elif base_package_type == 'deb' %}
        {% set designate_api_packages = ['designate-api'] %}
     {% endif %}
 {{ macros.install_packages(designate_api_packages | customizable("packages")) }}
diff --git a/docker/designate/designate-backend-bind9/Dockerfile.j2 b/docker/designate/designate-backend-bind9/Dockerfile.j2
index df016a25d..27e5ccdc3 100644
--- a/docker/designate/designate-backend-bind9/Dockerfile.j2
+++ b/docker/designate/designate-backend-bind9/Dockerfile.j2
@@ -5,19 +5,19 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
-{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+{% if base_package_type == 'rpm' %}
    {% set designate_backend_bind9_packages = ['bind'] %}
 
 {{ macros.install_packages(designate_backend_bind9_packages | customizable("packages")) }}
 
-{% elif base_distro in ['debian', 'ubuntu'] %}
+{% elif base_package_type == 'deb' %}
    {% set designate_backend_bind9_packages = ['bind9'] %}
 
 {{ macros.install_packages(designate_backend_bind9_packages | customizable("packages")) }}
 
 {% endif %}
 
-{% set designate_backend_bind_name = 'bind' if base_distro in ['debian', 'ubuntu'] else 'named' %}
+{% set designate_backend_bind_name = 'bind' if base_package_type == 'deb' else 'named' %}
 
 RUN mkdir -p /var/lib/kolla/ /var/lib/{{ designate_backend_bind_name }}/ /run/{{ designate_backend_bind_name }} \
      && chown -R root: /var/lib/{{ designate_backend_bind_name }} /run/{{ designate_backend_bind_name }} \
diff --git a/docker/designate/designate-base/Dockerfile.j2 b/docker/designate/designate-base/Dockerfile.j2
index 7dabc7114..49fd8dfe4 100644
--- a/docker/designate/designate-base/Dockerfile.j2
+++ b/docker/designate/designate-base/Dockerfile.j2
@@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.configure_user(name='designate') }}
 
 {% if install_type == 'binary' %}
-    {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+    {% if base_package_type == 'rpm' %}
        {% set designate_base_packages = [
             'openstack-designate-common',
             'python-tooz',
@@ -17,7 +17,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         ] %}
 
 {{ macros.install_packages(designate_base_packages | customizable("packages")) }}
-    {% elif base_distro in ['debian', 'ubuntu'] %}
+    {% elif base_package_type == 'deb' %}
        {% set designate_base_packages = [
             'designate-common',
             'python-tooz'
diff --git a/docker/designate/designate-central/Dockerfile.j2 b/docker/designate/designate-central/Dockerfile.j2
index 849fe9d14..6fab7b7fc 100644
--- a/docker/designate/designate-central/Dockerfile.j2
+++ b/docker/designate/designate-central/Dockerfile.j2
@@ -6,9 +6,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}
-    {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+    {% if base_package_type == 'rpm' %}
        {% set designate_central_packages = ['openstack-designate-central'] %}
-    {% elif base_distro in ['debian', 'ubuntu']%}
+    {% elif base_package_type == 'deb'%}
        {% set designate_central_packages = ['designate-central'] %}
     {% endif %}
 {{ macros.install_packages(designate_central_packages | customizable("packages")) }}
diff --git a/docker/designate/designate-mdns/Dockerfile.j2 b/docker/designate/designate-mdns/Dockerfile.j2
index ee919acde..3a7133de4 100644
--- a/docker/designate/designate-mdns/Dockerfile.j2
+++ b/docker/designate/designate-mdns/Dockerfile.j2
@@ -6,9 +6,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}
-    {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+    {% if base_package_type == 'rpm' %}
        {% set designate_mdns_packages = ['openstack-designate-mdns'] %}
-    {% elif base_distro in ['debian', 'ubuntu'] %}
+    {% elif base_package_type == 'deb' %}
        {% set designate_mdns_packages = ['designate-mdns'] %}
     {% endif %}
 {{ macros.install_packages(designate_mdns_packages | customizable("packages")) }}
diff --git a/docker/designate/designate-pool-manager/Dockerfile.j2 b/docker/designate/designate-pool-manager/Dockerfile.j2
index 3ccd074b7..2414b7e8c 100644
--- a/docker/designate/designate-pool-manager/Dockerfile.j2
+++ b/docker/designate/designate-pool-manager/Dockerfile.j2
@@ -7,23 +7,23 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 # The bind9 package here is only to provide the rndc binary.
 {% if install_type == 'binary' %}
-    {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+    {% if base_package_type == 'rpm' %}
        {% set designate_pool_manager_packages = [
             'bind',
             'openstack-designate-pool-manager'
         ] %}
-    {% elif base_distro in ['debian', 'ubuntu'] %}
+    {% elif base_package_type == 'deb' %}
        {% set designate_pool_manager_packages = [
             'bind9',
             'designate-pool-manager'
         ] %}
     {% endif %}
 {% elif install_type == 'source' %}
-    {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+    {% if base_package_type == 'rpm' %}
        {% set designate_pool_manager_packages = [
             'bind'
         ] %}
-    {% elif base_distro in ['debian', 'ubuntu'] %}
+    {% elif base_package_type == 'deb' %}
        {% set designate_pool_manager_packages = [
             'bind9'
         ] %}
diff --git a/docker/designate/designate-producer/Dockerfile.j2 b/docker/designate/designate-producer/Dockerfile.j2
index 28bbbad19..21a60aea2 100644
--- a/docker/designate/designate-producer/Dockerfile.j2
+++ b/docker/designate/designate-producer/Dockerfile.j2
@@ -6,9 +6,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}
-    {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+    {% if base_package_type == 'rpm' %}
        {% set designate_producer_packages = ['openstack-designate-producer'] %}
-    {% elif base_distro in ['debian', 'ubuntu'] %}
+    {% elif base_package_type == 'deb' %}
        {% set designate_producer_packages = ['designate-producer'] %}
     {% endif %}
 {{ macros.install_packages(designate_producer_packages | customizable("packages")) }}
diff --git a/docker/designate/designate-sink/Dockerfile.j2 b/docker/designate/designate-sink/Dockerfile.j2
index aaf86ffdd..0afbd1604 100644
--- a/docker/designate/designate-sink/Dockerfile.j2
+++ b/docker/designate/designate-sink/Dockerfile.j2
@@ -6,12 +6,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}
-    {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+    {% if base_package_type == 'rpm' %}
        {% set designate_sink_packages = [
             'openstack-designate-sink',
             'python-designateclient'
         ] %}
-    {% elif base_distro in ['debian', 'ubuntu'] %}
+    {% elif base_package_type == 'deb' %}
        {% set designate_sink_packages = [
             'designate-sink',
             'python-designateclient'
diff --git a/docker/designate/designate-worker/Dockerfile.j2 b/docker/designate/designate-worker/Dockerfile.j2
index 23bb1f0f5..23af7a6d0 100644
--- a/docker/designate/designate-worker/Dockerfile.j2
+++ b/docker/designate/designate-worker/Dockerfile.j2
@@ -7,23 +7,23 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 # The bind9 package here is only to provide the rndc binary.
 {% if install_type == 'binary' %}
-    {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+    {% if base_package_type == 'rpm' %}
        {% set designate_worker_packages = [
             'bind',
             'openstack-designate-worker'
         ] %}
-    {% elif base_distro in ['debian', 'ubuntu'] %}
+    {% elif base_package_type == 'deb' %}
        {% set designate_worker_packages = [
             'bind9',
             'designate-worker'
         ] %}
     {% endif %}
 {% elif install_type == 'source' %}
-    {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+    {% if base_package_type == 'rpm' %}
        {% set designate_worker_packages = [
             'bind'
         ] %}
-    {% elif base_distro in ['debian', 'ubuntu'] %}
+    {% elif base_package_type == 'deb' %}
        {% set designate_worker_packages = [
             'bind9'
         ] %}