aboutsummaryrefslogtreecommitdiff
path: root/docker/manila
diff options
context:
space:
mode:
Diffstat (limited to 'docker/manila')
-rw-r--r--docker/manila/manila-api/Dockerfile.j22
-rw-r--r--docker/manila/manila-base/Dockerfile.j24
-rw-r--r--docker/manila/manila-data/Dockerfile.j24
-rw-r--r--docker/manila/manila-scheduler/Dockerfile.j22
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'