diff options
| author | Alex Schultz <aschultz@redhat.com> | 2019-01-15 16:58:25 -0700 |
|---|---|---|
| committer | Alex Schultz <aschultz@redhat.com> | 2019-01-17 08:23:41 -0700 |
| commit | ae1322ec10861678abe1137f3013030b34335bc7 (patch) | |
| tree | e3181569502d82f6b207dd258cffdb8058dc60ff /docker/tacker | |
| parent | fca732b81e4eb5daa56da16e338bdd305a56d5bd (diff) | |
| download | kolla-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/tacker')
| -rw-r--r-- | docker/tacker/tacker-base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/tacker/tacker-conductor/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/tacker/tacker-server/Dockerfile.j2 | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/docker/tacker/tacker-base/Dockerfile.j2 b/docker/tacker/tacker-base/Dockerfile.j2 index 4bc277170..5a3a8c870 100644 --- a/docker/tacker/tacker-base/Dockerfile.j2 +++ b/docker/tacker/tacker-base/Dockerfile.j2 @@ -9,13 +9,13 @@ 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 tacker_base_packages = [ 'openstack-tacker-common', 'python-networking-sfc' ] %} - {% elif base_distro in ['debian', 'ubuntu'] %} + {% elif base_package_type == 'deb' %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ && /bin/false diff --git a/docker/tacker/tacker-conductor/Dockerfile.j2 b/docker/tacker/tacker-conductor/Dockerfile.j2 index 2fe717c01..c4cf2e78b 100644 --- a/docker/tacker/tacker-conductor/Dockerfile.j2 +++ b/docker/tacker/tacker-conductor/Dockerfile.j2 @@ -7,12 +7,12 @@ 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 tacker_conductor_packages = [ 'openstack-tacker' ] %} - {% elif base_distro in ['debian', 'ubuntu'] %} + {% elif base_package_type == 'deb' %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ && /bin/false diff --git a/docker/tacker/tacker-server/Dockerfile.j2 b/docker/tacker/tacker-server/Dockerfile.j2 index 1e7bae11c..79b6b52c8 100644 --- a/docker/tacker/tacker-server/Dockerfile.j2 +++ b/docker/tacker/tacker-server/Dockerfile.j2 @@ -7,12 +7,12 @@ 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 tacker_server_packages = [ 'openstack-tacker' ] %} - {% elif base_distro in ['debian', 'ubuntu'] %} + {% elif base_package_type == 'deb' %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ && /bin/false |