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/nova/nova-libvirt | |
| 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/nova/nova-libvirt')
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index ba038bd61..7adb7ba3a 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -20,7 +20,7 @@ MAINTAINER {{ maintainer }} 'qemu-kvm' ] %} -{% elif base_distro == 'ubuntu' %} +{% elif base_distro in ['ubuntu'] %} {% set nova_libvirt_packages = [ 'ceph-common', @@ -34,7 +34,7 @@ MAINTAINER {{ maintainer }} 'xen-utils-4.6' ] %} -{% elif base_distro == 'debian' %} +{% elif base_distro in ['debian'] %} {% set nova_libvirt_packages = [ 'ceph-common', @@ -53,7 +53,7 @@ MAINTAINER {{ maintainer }} {{ macros.install_packages(nova_libvirt_packages | customizable("packages")) }} -{% if base_distro in ['ubuntu', 'debian'] %} +{% if base_distro in ['debian', 'ubuntu'] %} RUN rm -f /etc/libvirt/qemu/networks/default.xml /etc/libvirt/qemu/networks/autostart/default.xml |