aboutsummaryrefslogtreecommitdiff
path: root/docker/senlin
diff options
context:
space:
mode:
authorAlex Schultz <aschultz@redhat.com>2019-01-15 16:58:25 -0700
committerAlex Schultz <aschultz@redhat.com>2019-01-17 08:23:41 -0700
commitae1322ec10861678abe1137f3013030b34335bc7 (patch)
treee3181569502d82f6b207dd258cffdb8058dc60ff /docker/senlin
parentfca732b81e4eb5daa56da16e338bdd305a56d5bd (diff)
downloadkolla-ae1322ec10861678abe1137f3013030b34335bc7.tar.gz
kolla-ae1322ec10861678abe1137f3013030b34335bc7.zip
Use base_package_type
This change updates the docker files to use base_package_type instead of doing specific distro checks for the rhel/deb generic cases. The base_distro is still available and is used when a specific distro needs a customization but if the differences are purely rpm vs deb, then the base_package_type can be used. Change-Id: I8d720bb185df65a0178061ccf20b1ab2265da2c5
Diffstat (limited to 'docker/senlin')
-rw-r--r--docker/senlin/senlin-api/Dockerfile.j24
-rw-r--r--docker/senlin/senlin-base/Dockerfile.j24
-rw-r--r--docker/senlin/senlin-engine/Dockerfile.j24
3 files changed, 6 insertions, 6 deletions
diff --git a/docker/senlin/senlin-api/Dockerfile.j2 b/docker/senlin/senlin-api/Dockerfile.j2
index ebc1453c7..e60b77d35 100644
--- a/docker/senlin/senlin-api/Dockerfile.j2
+++ b/docker/senlin/senlin-api/Dockerfile.j2
@@ -6,10 +6,10 @@ 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 senlin_api_packages = ['openstack-senlin-api'] %}
- {% elif base_distro in ['debian', 'ubuntu'] %}
+ {% elif base_package_type == 'deb' %}
{% set senlin_api_packages = ['senlin-api'] %}
{% endif %}
diff --git a/docker/senlin/senlin-base/Dockerfile.j2 b/docker/senlin/senlin-base/Dockerfile.j2
index 46f9797d6..303de448a 100644
--- a/docker/senlin/senlin-base/Dockerfile.j2
+++ b/docker/senlin/senlin-base/Dockerfile.j2
@@ -8,10 +8,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='senlin') }}
{% if install_type == 'binary' %}
- {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+ {% if base_package_type == 'rpm' %}
{% set senlin_base_packages = ['openstack-senlin-common'] %}
- {% elif base_distro in ['debian', 'ubuntu'] %}
+ {% elif base_package_type == 'deb' %}
{% set senlin_base_packages = ['senlin-common'] %}
{% endif %}
diff --git a/docker/senlin/senlin-engine/Dockerfile.j2 b/docker/senlin/senlin-engine/Dockerfile.j2
index a31a04146..17ec88da5 100644
--- a/docker/senlin/senlin-engine/Dockerfile.j2
+++ b/docker/senlin/senlin-engine/Dockerfile.j2
@@ -6,10 +6,10 @@ 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 senlin_engine_packages = ['openstack-senlin-engine'] %}
- {% elif base_distro in ['debian', 'ubuntu'] %}
+ {% elif base_package_type == 'deb' %}
{% set senlin_engine_packages = ['senlin-engine'] %}
{% endif %}