diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2017-02-12 18:36:51 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2017-04-04 22:48:18 +0200 |
| commit | 69fef5cd59286b5eeaa4deaf9da97511413ed653 (patch) | |
| tree | 50a557181cd76f1ac6df80b47665ab4c4d23d732 /docker/tgtd | |
| parent | 0b6b2c40dd320f4a21a2e5acd8a33b8e4f0cf691 (diff) | |
| download | kolla-69fef5cd59286b5eeaa4deaf9da97511413ed653.tar.gz kolla-69fef5cd59286b5eeaa4deaf9da97511413ed653.zip | |
debian: enable all images enabled for Ubuntu
Debian support is not maintained in Kolla so it got a bit behind Ubuntu
one. This changeset enables Debian for all images. Jessie (even with
backports) may be too old for some images though.
Also unify distro check to ['debian', 'ubuntu'] to keep alphabetical order
like it is done for RPM distributions.
Partially-Implements: blueprint multiarch-and-arm64-containers
Change-Id: I056233fbfa277e0e2360c07c3f80d9558c554357
Diffstat (limited to 'docker/tgtd')
| -rw-r--r-- | docker/tgtd/Dockerfile.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/tgtd/Dockerfile.j2 b/docker/tgtd/Dockerfile.j2 index 284b5c61d..386c277e3 100644 --- a/docker/tgtd/Dockerfile.j2 +++ b/docker/tgtd/Dockerfile.j2 @@ -11,7 +11,7 @@ MAINTAINER {{ maintainer }} {{ 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 ['ubuntu', 'debian'] %} +{% elif base_distro in ['debian', 'ubuntu'] %} {% set tgtd_packages = ['tgt'] %} {{ macros.install_packages(tgtd_packages | customizable("packages")) }} |
