diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2017-02-12 18:36:51 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2017-04-04 22:48:18 +0200 |
| commit | 69fef5cd59286b5eeaa4deaf9da97511413ed653 (patch) | |
| tree | 50a557181cd76f1ac6df80b47665ab4c4d23d732 /docker/heat | |
| parent | 0b6b2c40dd320f4a21a2e5acd8a33b8e4f0cf691 (diff) | |
| download | kolla-69fef5cd59286b5eeaa4deaf9da97511413ed653.tar.gz kolla-69fef5cd59286b5eeaa4deaf9da97511413ed653.zip | |
debian: enable all images enabled for Ubuntu
Debian support is not maintained in Kolla so it got a bit behind Ubuntu
one. This changeset enables Debian for all images. Jessie (even with
backports) may be too old for some images though.
Also unify distro check to ['debian', 'ubuntu'] to keep alphabetical order
like it is done for RPM distributions.
Partially-Implements: blueprint multiarch-and-arm64-containers
Change-Id: I056233fbfa277e0e2360c07c3f80d9558c554357
Diffstat (limited to 'docker/heat')
| -rw-r--r-- | docker/heat/heat-api-cfn/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/heat/heat-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/heat/heat-base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/heat/heat-engine/Dockerfile.j2 | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2 index 71ad40e8e..7ea7318e7 100644 --- a/docker/heat/heat-api-cfn/Dockerfile.j2 +++ b/docker/heat/heat-api-cfn/Dockerfile.j2 @@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }} {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set heat_api_cfn_packages = ['openstack-heat-api-cfn'] %} - {% elif base_distro in ['ubuntu'] %} + {% elif base_distro in ['debian', 'ubuntu'] %} {% 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 4ed685f53..e021ad02d 100644 --- a/docker/heat/heat-api/Dockerfile.j2 +++ b/docker/heat/heat-api/Dockerfile.j2 @@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }} {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set heat_api_packages = ['openstack-heat-api'] %} - {% elif base_distro in ['ubuntu'] %} + {% elif base_distro in ['debian', 'ubuntu'] %} {% 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 40fb62468..3b900fa18 100644 --- a/docker/heat/heat-base/Dockerfile.j2 +++ b/docker/heat/heat-base/Dockerfile.j2 @@ -19,7 +19,7 @@ MAINTAINER {{ maintainer }} {{ 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 ['ubuntu'] %} +{% elif base_distro in ['debian', 'ubuntu'] %} {% set heat_base_packages = [ 'apache2', 'heat-common', @@ -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 ['ubuntu'] %} +{% elif base_distro in ['debian', 'ubuntu'] %} {% set heat_base_packages = [ 'apache2', diff --git a/docker/heat/heat-engine/Dockerfile.j2 b/docker/heat/heat-engine/Dockerfile.j2 index 98339e0e5..7b753df65 100644 --- a/docker/heat/heat-engine/Dockerfile.j2 +++ b/docker/heat/heat-engine/Dockerfile.j2 @@ -12,7 +12,7 @@ MAINTAINER {{ maintainer }} 'python-zaqarclient', 'openstack-heat-engine' ] %} - {% elif base_distro in ['ubuntu'] %} + {% elif base_distro in ['debian', 'ubuntu'] %} {% set heat_engine_packages = ['heat-engine'] %} {% endif %} {{ macros.install_packages(heat_engine_packages | customizable("packages")) }} |