openstack/kolla
Code Issues Proposed changes

Use base_package_type

Browse Source 
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
This commit is contained in:
Alex Schultz
2019-01-15 16:58:25 -07:00
parent fca732b81e
commit ae1322ec10
203 changed files with 487 additions and 487 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docker/tgtd/Dockerfile.j2
View File

@@ -5,13 +5,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% if base_package_type == 'rpm' %}
{% set tgtd_packages = ['scsi-target-utils'] %}
{{ macros.install_packages(tgtd_packages | customizable("packages")) }}
RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/tgtd.conf
{% elif base_distro in ['debian', 'ubuntu'] %}
{% elif base_package_type == 'deb' %}
{% set tgtd_packages = ['tgt'] %}
{{ macros.install_packages(tgtd_packages | customizable("packages")) }}