aboutsummaryrefslogtreecommitdiff
path: root/docker/barbican
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-06 10:14:03 +0000
committerGerrit Code Review <review@openstack.org>2017-04-06 10:14:03 +0000
commit3bd8fe8e101eceaeb366e8cd2cb4ae20ac3cb5b7 (patch)
treed923b0b6e4e8fbf1b97a4fdcf6c4b4b336c1d878 /docker/barbican
parenta130ecb153f555ffd96bebf554eaa10c34a1486d (diff)
parent69fef5cd59286b5eeaa4deaf9da97511413ed653 (diff)
downloadkolla-3bd8fe8e101eceaeb366e8cd2cb4ae20ac3cb5b7.tar.gz
kolla-3bd8fe8e101eceaeb366e8cd2cb4ae20ac3cb5b7.zip
Merge "debian: enable all images enabled for Ubuntu"
Diffstat (limited to 'docker/barbican')
-rw-r--r--docker/barbican/barbican-api/Dockerfile.j22
-rw-r--r--docker/barbican/barbican-base/Dockerfile.j24
-rw-r--r--docker/barbican/barbican-keystone-listener/Dockerfile.j22
-rw-r--r--docker/barbican/barbican-worker/Dockerfile.j22
4 files changed, 5 insertions, 5 deletions
diff --git a/docker/barbican/barbican-api/Dockerfile.j2 b/docker/barbican/barbican-api/Dockerfile.j2
index 78b27d5b0..ee0d717eb 100644
--- a/docker/barbican/barbican-api/Dockerfile.j2
+++ b/docker/barbican/barbican-api/Dockerfile.j2
@@ -11,7 +11,7 @@ MAINTAINER {{ maintainer }}
'openstack-barbican-api',
'uwsgi-plugin-python'
] %}
- {% elif base_distro in ['ubuntu'] %}
+ {% elif base_distro in ['debian', 'ubuntu'] %}
{% set barbican_api_packages = [
'barbican-api',
'uwsgi-plugin-python'
diff --git a/docker/barbican/barbican-base/Dockerfile.j2 b/docker/barbican/barbican-base/Dockerfile.j2
index f93a6d6d9..8f60695c7 100644
--- a/docker/barbican/barbican-base/Dockerfile.j2
+++ b/docker/barbican/barbican-base/Dockerfile.j2
@@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set barbican_base_packages = ['openstack-barbican-common'] %}
- {% elif base_distro in ['ubuntu'] %}
+ {% elif base_distro in ['debian', 'ubuntu'] %}
{% set barbican_base_packages = ['barbican-common'] %}
{% endif %}
@@ -19,7 +19,7 @@ MAINTAINER {{ maintainer }}
{% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set barbican_base_packages = ['uwsgi-plugin-python'] %}
- {% elif base_distro in ['ubuntu'] %}
+ {% elif base_distro in ['debian', 'ubuntu'] %}
{% set barbican_base_packages = ['uwsgi-plugin-python'] %}
{% endif %}
diff --git a/docker/barbican/barbican-keystone-listener/Dockerfile.j2 b/docker/barbican/barbican-keystone-listener/Dockerfile.j2
index 9319b3214..581c142c5 100644
--- a/docker/barbican/barbican-keystone-listener/Dockerfile.j2
+++ b/docker/barbican/barbican-keystone-listener/Dockerfile.j2
@@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set barbican_keystone_listener_packages = ['openstack-barbican-keystone-listener'] %}
- {% elif base_distro in ['ubuntu'] %}
+ {% elif base_distro in ['debian', 'ubuntu'] %}
{% set barbican_keystone_listener_packages = ['barbican-keystone-listener'] %}
{% endif %}
diff --git a/docker/barbican/barbican-worker/Dockerfile.j2 b/docker/barbican/barbican-worker/Dockerfile.j2
index b0a9c63be..7c3bf96e8 100644
--- a/docker/barbican/barbican-worker/Dockerfile.j2
+++ b/docker/barbican/barbican-worker/Dockerfile.j2
@@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set barbican_worker_packages = ['openstack-barbican-worker'] %}
- {% elif base_distro in ['ubuntu'] %}
+ {% elif base_distro in ['debian', 'ubuntu'] %}
{% set barbican_worker_packages = ['barbican-worker'] %}
{% endif %}