diff options
| author | Zuul <zuul@review.openstack.org> | 2019-01-18 21:01:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-01-18 21:01:55 +0000 |
| commit | cea1c1ebd95e88e0bb2911fea486fe09f600af22 (patch) | |
| tree | a53f9c4f6c1fce4364758a5de52ccebc68c36120 /docker/senlin | |
| parent | 8344c8ea21428c5978d3c5e7ae74d6e43dd8ba95 (diff) | |
| parent | ae1322ec10861678abe1137f3013030b34335bc7 (diff) | |
| download | kolla-cea1c1ebd95e88e0bb2911fea486fe09f600af22.tar.gz kolla-cea1c1ebd95e88e0bb2911fea486fe09f600af22.zip | |
Merge "Use base_package_type"
Diffstat (limited to 'docker/senlin')
| -rw-r--r-- | docker/senlin/senlin-api/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/senlin/senlin-base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/senlin/senlin-engine/Dockerfile.j2 | 4 |
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 %} |