aboutsummaryrefslogtreecommitdiff
path: root/docker/swift
diff options
context:
space:
mode:
Diffstat (limited to 'docker/swift')
-rw-r--r--docker/swift/swift-account/Dockerfile.j22
-rw-r--r--docker/swift/swift-base/Dockerfile.j28
-rw-r--r--docker/swift/swift-container/Dockerfile.j22
-rw-r--r--docker/swift/swift-object-expirer/Dockerfile.j22
-rw-r--r--docker/swift/swift-object/Dockerfile.j22
-rw-r--r--docker/swift/swift-proxy-server/Dockerfile.j22
-rw-r--r--docker/swift/swift-rsyncd/Dockerfile.j22
7 files changed, 10 insertions, 10 deletions
diff --git a/docker/swift/swift-account/Dockerfile.j2 b/docker/swift/swift-account/Dockerfile.j2
index 153555cc3..936312f23 100644
--- a/docker/swift/swift-account/Dockerfile.j2
+++ b/docker/swift/swift-account/Dockerfile.j2
@@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set swift_acount_packages = ['openstack-swift-account'] %}
- {% elif base_distro in ['ubuntu'] %}
+ {% elif base_distro in ['debian', 'ubuntu'] %}
{% set swift_acount_packages = ['swift-account'] %}
{% endif %}
diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2
index a037a7f71..895d609bc 100644
--- a/docker/swift/swift-base/Dockerfile.j2
+++ b/docker/swift/swift-base/Dockerfile.j2
@@ -11,12 +11,12 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set swift_base_packages = [
'openstack-swift'
- ]
+ ]
%}
- {% elif base_distro in ['ubuntu'] %}
+ {% elif base_distro in ['debian', 'ubuntu'] %}
{% set swift_base_packages = [
'swift'
- ]
+ ]
%}
{% endif %}
@@ -24,7 +24,7 @@ MAINTAINER {{ maintainer }}
{% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set swift_base_packages = ['liberasurecode-devel'] %}
- {% elif base_distro in ['ubuntu', 'debian'] %}
+ {% elif base_distro in ['debian', 'ubuntu'] %}
{% set swift_base_packages = ['liberasurecode-dev'] %}
{% endif %}
diff --git a/docker/swift/swift-container/Dockerfile.j2 b/docker/swift/swift-container/Dockerfile.j2
index d1b038f5e..ad54541c8 100644
--- a/docker/swift/swift-container/Dockerfile.j2
+++ b/docker/swift/swift-container/Dockerfile.j2
@@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set swift_container_packages = ['openstack-swift-container'] %}
- {% elif base_distro in ['ubuntu'] %}
+ {% elif base_distro in ['debian', 'ubuntu'] %}
{% set swift_container_packages = ['swift-container'] %}
{% endif %}
diff --git a/docker/swift/swift-object-expirer/Dockerfile.j2 b/docker/swift/swift-object-expirer/Dockerfile.j2
index f16871648..b7f70acf0 100644
--- a/docker/swift/swift-object-expirer/Dockerfile.j2
+++ b/docker/swift/swift-object-expirer/Dockerfile.j2
@@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
# RDO has it packaged in the wrong package for now. The issue is being
# tracked in https://bugzilla.redhat.com/show_bug.cgi?id=1382921
{% set swift_object_expirer_packages = ['openstack-swift-proxy'] %}
- {% elif base_distro in ['ubuntu'] %}
+ {% elif base_distro in ['debian', 'ubuntu'] %}
{% set swift_object_expirer_packages = ['swift-object'] %}
{% endif %}
diff --git a/docker/swift/swift-object/Dockerfile.j2 b/docker/swift/swift-object/Dockerfile.j2
index ee7ff2346..e9d71231a 100644
--- a/docker/swift/swift-object/Dockerfile.j2
+++ b/docker/swift/swift-object/Dockerfile.j2
@@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set swift_object_packages = ['openstack-swift-object'] %}
- {% elif base_distro in ['ubuntu'] %}
+ {% elif base_distro in ['debian', 'ubuntu'] %}
{% set swift_object_packages = ['swift-object'] %}
{% endif %}
diff --git a/docker/swift/swift-proxy-server/Dockerfile.j2 b/docker/swift/swift-proxy-server/Dockerfile.j2
index 430fd4f5d..11887d306 100644
--- a/docker/swift/swift-proxy-server/Dockerfile.j2
+++ b/docker/swift/swift-proxy-server/Dockerfile.j2
@@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set swift_proxy_server_packages = ['openstack-swift-proxy'] %}
- {% elif base_distro in ['ubuntu'] %}
+ {% elif base_distro in ['debian', 'ubuntu'] %}
{% set swift_proxy_server_packages = ['swift-proxy'] %}
{% endif %}
diff --git a/docker/swift/swift-rsyncd/Dockerfile.j2 b/docker/swift/swift-rsyncd/Dockerfile.j2
index d43efa177..757b1d15a 100644
--- a/docker/swift/swift-rsyncd/Dockerfile.j2
+++ b/docker/swift/swift-rsyncd/Dockerfile.j2
@@ -7,7 +7,7 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set swift_rsyncd_packages = ['rsync'] %}
-{% elif base_distro in ['ubuntu', 'debian'] %}
+{% elif base_distro in ['debian', 'ubuntu'] %}
{% set swift_rsyncd_packages = ['rsync'] %}
{% endif %}