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/manila | |
| 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/manila')
| -rw-r--r-- | docker/manila/manila-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/manila/manila-base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/manila/manila-data/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/manila/manila-scheduler/Dockerfile.j2 | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/docker/manila/manila-api/Dockerfile.j2 b/docker/manila/manila-api/Dockerfile.j2 index c2b210a31..c5be544d0 100644 --- a/docker/manila/manila-api/Dockerfile.j2 +++ b/docker/manila/manila-api/Dockerfile.j2 @@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} - {% if base_distro in ['ubuntu'] %} + {% if base_distro in ['debian', 'ubuntu'] %} {% set manila_api_packages = [ 'manila-api' diff --git a/docker/manila/manila-base/Dockerfile.j2 b/docker/manila/manila-base/Dockerfile.j2 index c6b222deb..863d31203 100644 --- a/docker/manila/manila-base/Dockerfile.j2 +++ b/docker/manila/manila-base/Dockerfile.j2 @@ -15,7 +15,7 @@ MAINTAINER {{ maintainer }} 'openvswitch' ] %} - {% elif base_distro in ['ubuntu'] %} + {% elif base_distro in ['debian', 'ubuntu'] %} {% set manila_base_packages = [ 'manila-common', @@ -31,7 +31,7 @@ MAINTAINER {{ maintainer }} {% set manila_base_packages = ['openvswitch'] %} - {% elif base_distro in ['ubuntu', 'debian'] %} + {% elif base_distro in ['debian', 'ubuntu'] %} {% set manila_base_packages = ['openvswitch-switch'] %} diff --git a/docker/manila/manila-data/Dockerfile.j2 b/docker/manila/manila-data/Dockerfile.j2 index 46cae63f1..a14e5bb66 100644 --- a/docker/manila/manila-data/Dockerfile.j2 +++ b/docker/manila/manila-data/Dockerfile.j2 @@ -11,7 +11,7 @@ MAINTAINER {{ maintainer }} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ && /bin/false - {% elif base_distro in ['ubuntu'] %} + {% elif base_distro in ['debian', 'ubuntu'] %} {% set manila_data_packages = [ 'manila-data' @@ -26,7 +26,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ 'nfs-utils' ] %} - {% elif base_distro in ['ubuntu', 'debian'] %} + {% elif base_distro in ['debian', 'ubuntu'] %} {% set manila_data_packages = [ 'nfs-common' diff --git a/docker/manila/manila-scheduler/Dockerfile.j2 b/docker/manila/manila-scheduler/Dockerfile.j2 index 28b62b141..75adfc06e 100644 --- a/docker/manila/manila-scheduler/Dockerfile.j2 +++ b/docker/manila/manila-scheduler/Dockerfile.j2 @@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} - {% if base_distro in ['ubuntu'] %} + {% if base_distro in ['debian', 'ubuntu'] %} {% set manila_scheduler_packages = [ 'manila-scheduler' |