aboutsummaryrefslogtreecommitdiff
path: root/docker/barbican
diff options
context:
space:
mode:
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 d9c122675..bc019d446 100644
--- a/docker/barbican/barbican-api/Dockerfile.j2
+++ b/docker/barbican/barbican-api/Dockerfile.j2
@@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
- {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+ {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set barbican_api_packages = ['openstack-barbican-api'] %}
{% elif base_distro in ['ubuntu'] %}
{% set barbican_api_packages = [
diff --git a/docker/barbican/barbican-base/Dockerfile.j2 b/docker/barbican/barbican-base/Dockerfile.j2
index 3eb5b8845..5f44432bf 100644
--- a/docker/barbican/barbican-base/Dockerfile.j2
+++ b/docker/barbican/barbican-base/Dockerfile.j2
@@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
- {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+ {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set barbican_base_packages = ['openstack-barbican-common'] %}
{% elif base_distro in ['ubuntu'] %}
{% set barbican_base_packages = ['barbican-common'] %}
@@ -15,7 +15,7 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(barbican_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
- {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+ {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set barbican_base_packages = ['uwsgi-plugin-python'] %}
{% elif base_distro in ['ubuntu'] %}
{% set barbican_base_packages = ['uwsgi-plugin-python'] %}
diff --git a/docker/barbican/barbican-keystone-listener/Dockerfile.j2 b/docker/barbican/barbican-keystone-listener/Dockerfile.j2
index c35c1696a..9319b3214 100644
--- a/docker/barbican/barbican-keystone-listener/Dockerfile.j2
+++ b/docker/barbican/barbican-keystone-listener/Dockerfile.j2
@@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
- {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+ {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set barbican_keystone_listener_packages = ['openstack-barbican-keystone-listener'] %}
{% elif base_distro in ['ubuntu'] %}
{% set barbican_keystone_listener_packages = ['barbican-keystone-listener'] %}
diff --git a/docker/barbican/barbican-worker/Dockerfile.j2 b/docker/barbican/barbican-worker/Dockerfile.j2
index 65208e0cc..b0a9c63be 100644
--- a/docker/barbican/barbican-worker/Dockerfile.j2
+++ b/docker/barbican/barbican-worker/Dockerfile.j2
@@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
- {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+ {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set barbican_worker_packages = ['openstack-barbican-worker'] %}
{% elif base_distro in ['ubuntu'] %}
{% set barbican_worker_packages = ['barbican-worker'] %}