aboutsummaryrefslogtreecommitdiff
path: root/docker/magnum
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-01-18 21:01:55 +0000
committerGerrit Code Review <review@openstack.org>2019-01-18 21:01:55 +0000
commitcea1c1ebd95e88e0bb2911fea486fe09f600af22 (patch)
treea53f9c4f6c1fce4364758a5de52ccebc68c36120 /docker/magnum
parent8344c8ea21428c5978d3c5e7ae74d6e43dd8ba95 (diff)
parentae1322ec10861678abe1137f3013030b34335bc7 (diff)
downloadkolla-cea1c1ebd95e88e0bb2911fea486fe09f600af22.tar.gz
kolla-cea1c1ebd95e88e0bb2911fea486fe09f600af22.zip
Merge "Use base_package_type"
Diffstat (limited to 'docker/magnum')
-rw-r--r--docker/magnum/magnum-api/Dockerfile.j24
-rw-r--r--docker/magnum/magnum-base/Dockerfile.j24
-rw-r--r--docker/magnum/magnum-conductor/Dockerfile.j24
3 files changed, 6 insertions, 6 deletions
diff --git a/docker/magnum/magnum-api/Dockerfile.j2 b/docker/magnum/magnum-api/Dockerfile.j2
index a799d2014..a16bfe539 100644
--- a/docker/magnum/magnum-api/Dockerfile.j2
+++ b/docker/magnum/magnum-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 magnum_api_packages = ['openstack-magnum-api'] %}
- {% elif base_distro in ['debian', 'ubuntu'] %}
+ {% elif base_package_type == 'deb' %}
{% set magnum_api_packages = ['magnum-api'] %}
{% endif %}
{{ macros.install_packages(magnum_api_packages | customizable("packages")) }}
diff --git a/docker/magnum/magnum-base/Dockerfile.j2 b/docker/magnum/magnum-base/Dockerfile.j2
index bd86e95c9..9ae597a29 100644
--- a/docker/magnum/magnum-base/Dockerfile.j2
+++ b/docker/magnum/magnum-base/Dockerfile.j2
@@ -8,9 +8,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='magnum') }}
{% if install_type == 'binary' %}
- {% if base_distro in ['centos', 'oraclelinux'] %}
+ {% if base_package_type == 'rpm' %}
{% set magnum_base_packages = ['openstack-magnum-common'] %}
- {% elif base_distro in ['debian', 'ubuntu'] %}
+ {% elif base_package_type == 'deb' %}
{% set magnum_base_packages = ['magnum-common'] %}
{% endif %}
{{ macros.install_packages(magnum_base_packages | customizable("packages")) }}
diff --git a/docker/magnum/magnum-conductor/Dockerfile.j2 b/docker/magnum/magnum-conductor/Dockerfile.j2
index e080e3b86..7946256cd 100644
--- a/docker/magnum/magnum-conductor/Dockerfile.j2
+++ b/docker/magnum/magnum-conductor/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 magnum_conductor_packages = [
'openstack-magnum-conductor'
] %}
- {% elif base_distro in ['debian', 'ubuntu'] %}
+ {% elif base_package_type == 'deb' %}
{% set magnum_conductor_packages = [
'magnum-conductor'
] %}