diff options
| author | Zuul <zuul@review.openstack.org> | 2019-01-21 13:43:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-01-21 13:43:50 +0000 |
| commit | 53c8ea46dfff2790a99dc216ea639965df1c82f6 (patch) | |
| tree | 1e8b77d3431dd356e024e1f5602896c62312b072 | |
| parent | cea1c1ebd95e88e0bb2911fea486fe09f600af22 (diff) | |
| parent | d78144fbdbcdd10829214452a27097cc7ec760c6 (diff) | |
| download | kolla-53c8ea46dfff2790a99dc216ea639965df1c82f6.tar.gz kolla-53c8ea46dfff2790a99dc216ea639965df1c82f6.zip | |
Merge "Fix magnum logic for rhel"
| -rw-r--r-- | docker/magnum/magnum-api/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/magnum/magnum-base/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/magnum/magnum-conductor/Dockerfile.j2 | 6 |
3 files changed, 12 insertions, 4 deletions
diff --git a/docker/magnum/magnum-api/Dockerfile.j2 b/docker/magnum/magnum-api/Dockerfile.j2 index a16bfe539..2a7f78cce 100644 --- a/docker/magnum/magnum-api/Dockerfile.j2 +++ b/docker/magnum/magnum-api/Dockerfile.j2 @@ -6,8 +6,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} - {% if base_package_type == 'rpm' %} + {% if base_package_type == 'rpm' and base_distro != 'rhel' %} {% set magnum_api_packages = ['openstack-magnum-api'] %} + {% elif base_package_type == 'rpm' and base_distro == 'rhel' %} +RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ + && /bin/false {% elif base_package_type == 'deb' %} {% set magnum_api_packages = ['magnum-api'] %} {% endif %} diff --git a/docker/magnum/magnum-base/Dockerfile.j2 b/docker/magnum/magnum-base/Dockerfile.j2 index 9ae597a29..063db926e 100644 --- a/docker/magnum/magnum-base/Dockerfile.j2 +++ b/docker/magnum/magnum-base/Dockerfile.j2 @@ -8,8 +8,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='magnum') }} {% if install_type == 'binary' %} - {% if base_package_type == 'rpm' %} + {% if base_package_type == 'rpm' and base_distro != 'rhel' %} {% set magnum_base_packages = ['openstack-magnum-common'] %} + {% elif base_package_type == 'rpm' and base_distro == 'rhel' %} +RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ + && /bin/bash {% elif base_package_type == 'deb' %} {% set magnum_base_packages = ['magnum-common'] %} {% endif %} diff --git a/docker/magnum/magnum-conductor/Dockerfile.j2 b/docker/magnum/magnum-conductor/Dockerfile.j2 index 7946256cd..c06bac11a 100644 --- a/docker/magnum/magnum-conductor/Dockerfile.j2 +++ b/docker/magnum/magnum-conductor/Dockerfile.j2 @@ -6,11 +6,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} - {% if base_package_type == 'rpm' %} + {% if base_package_type == 'rpm' and base_distro != 'rhel' %} {% set magnum_conductor_packages = [ 'openstack-magnum-conductor' ] %} - + {% elif base_package_type == 'rpm' and base_distro == 'rhel' %} +RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ + && /bin/false {% elif base_package_type == 'deb' %} {% set magnum_conductor_packages = [ 'magnum-conductor' |