aboutsummaryrefslogtreecommitdiff
path: root/docker/heat
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/heat
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/heat')
-rw-r--r--docker/heat/heat-all/Dockerfile.j24
-rw-r--r--docker/heat/heat-api-cfn/Dockerfile.j24
-rw-r--r--docker/heat/heat-api/Dockerfile.j24
-rw-r--r--docker/heat/heat-base/Dockerfile.j28
-rw-r--r--docker/heat/heat-engine/Dockerfile.j24
5 files changed, 12 insertions, 12 deletions
diff --git a/docker/heat/heat-all/Dockerfile.j2 b/docker/heat/heat-all/Dockerfile.j2
index d20d5e4d2..b73956cea 100644
--- a/docker/heat/heat-all/Dockerfile.j2
+++ b/docker/heat/heat-all/Dockerfile.j2
@@ -6,13 +6,13 @@ 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 heat_all_packages = [
'openstack-heat-api',
'openstack-heat-engine',
'openstack-heat-monolith'
] %}
- {% elif base_distro in ['debian', 'ubuntu'] %}
+ {% elif base_package_type == 'deb' %}
RUN echo 'heat-all not yet available for {{ base_distro }}' && /bin/false
{% endif %}
{{ macros.install_packages(heat_all_packages | customizable("packages")) }}
diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2
index 8fdb4bb7b..5f25ab074 100644
--- a/docker/heat/heat-api-cfn/Dockerfile.j2
+++ b/docker/heat/heat-api-cfn/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 heat_api_cfn_packages = ['openstack-heat-api-cfn'] %}
- {% elif base_distro in ['debian', 'ubuntu'] %}
+ {% elif base_package_type == 'deb' %}
{% set heat_api_cfn_packages = ['heat-api-cfn'] %}
{% endif %}
{{ macros.install_packages(heat_api_cfn_packages | customizable("packages")) }}
diff --git a/docker/heat/heat-api/Dockerfile.j2 b/docker/heat/heat-api/Dockerfile.j2
index 40b06fb27..6b1529d6e 100644
--- a/docker/heat/heat-api/Dockerfile.j2
+++ b/docker/heat/heat-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 heat_api_packages = ['openstack-heat-api'] %}
- {% elif base_distro in ['debian', 'ubuntu'] %}
+ {% elif base_package_type == 'deb' %}
{% set heat_api_packages = ['heat-api'] %}
{% endif %}
{{ macros.install_packages(heat_api_packages | customizable("packages")) }}
diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2
index f48d8281e..a5e2405ac 100644
--- a/docker/heat/heat-base/Dockerfile.j2
+++ b/docker/heat/heat-base/Dockerfile.j2
@@ -9,7 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if install_type == 'binary' %}
-{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+{% if base_package_type == 'rpm' %}
{% set heat_base_packages = [
'httpd',
'mod_ssl',
@@ -19,7 +19,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.install_packages(heat_base_packages | customizable("packages")) }}
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
&& sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
-{% elif base_distro in ['debian', 'ubuntu'] %}
+{% elif base_package_type == 'deb' %}
{% set heat_base_packages = [
'apache2',
'heat-common',
@@ -31,7 +31,7 @@ RUN echo > /etc/apache2/ports.conf
{% elif install_type == 'source' %}
-{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+{% if base_package_type == 'rpm' %}
{% set heat_base_packages = [
'httpd',
@@ -42,7 +42,7 @@ RUN echo > /etc/apache2/ports.conf
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
&& sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
-{% elif base_distro in ['debian', 'ubuntu'] %}
+{% elif base_package_type == 'deb' %}
{% set heat_base_packages = [
'apache2',
diff --git a/docker/heat/heat-engine/Dockerfile.j2 b/docker/heat/heat-engine/Dockerfile.j2
index 64c642fa9..56e7b5144 100644
--- a/docker/heat/heat-engine/Dockerfile.j2
+++ b/docker/heat/heat-engine/Dockerfile.j2
@@ -6,13 +6,13 @@ 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 heat_engine_packages = [
'python-barbicanclient',
'python-zaqarclient',
'openstack-heat-engine'
] %}
- {% elif base_distro in ['debian', 'ubuntu'] %}
+ {% elif base_package_type == 'deb' %}
{% set heat_engine_packages = ['heat-engine'] %}
{% endif %}
{{ macros.install_packages(heat_engine_packages | customizable("packages")) }}