diff options
| author | Christian Berendt <berendt@betacloud-solutions.de> | 2016-11-03 10:37:21 +0100 |
|---|---|---|
| committer | Christian Berendt <berendt@betacloud-solutions.de> | 2016-11-03 10:50:22 +0100 |
| commit | 5cd30d491435b73a1cb7a2b8981de2c1f85761c7 (patch) | |
| tree | a579e2780c5546cc372d3030fd4851f389019cea /docker/keystone | |
| parent | 9779778a1ebc99b6a48a8d97282bf4d2d8f473d7 (diff) | |
| download | kolla-5cd30d491435b73a1cb7a2b8981de2c1f85761c7.tar.gz kolla-5cd30d491435b73a1cb7a2b8981de2c1f85761c7.zip | |
Remove Fedora support
Closes-bug: #1616387
Change-Id: Id97f88b9baa3d48d33ce120962450a374282d044
Diffstat (limited to 'docker/keystone')
| -rw-r--r-- | docker/keystone/keystone-base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/keystone/keystone-fernet/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/keystone/keystone-ssh/Dockerfile.j2 | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/docker/keystone/keystone-base/Dockerfile.j2 index fe4c5cf1d..195983e26 100644 --- a/docker/keystone/keystone-base/Dockerfile.j2 +++ b/docker/keystone/keystone-base/Dockerfile.j2 @@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set keystone_base_packages = [ 'openstack-keystone', 'python-keystoneclient', @@ -38,7 +38,7 @@ RUN mkdir -p /var/www/cgi-bin/keystone \ {% endif %} {% elif install_type == 'source' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set keystone_base_packages = [ 'httpd', 'mod_wsgi', diff --git a/docker/keystone/keystone-fernet/Dockerfile.j2 b/docker/keystone/keystone-fernet/Dockerfile.j2 index 8c058e205..6710490c4 100644 --- a/docker/keystone/keystone-fernet/Dockerfile.j2 +++ b/docker/keystone/keystone-fernet/Dockerfile.j2 @@ -5,7 +5,7 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} -{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} +{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set keystone_fernet_packages = [ 'cronie', 'openssh-clients', diff --git a/docker/keystone/keystone-ssh/Dockerfile.j2 b/docker/keystone/keystone-ssh/Dockerfile.j2 index 92fa41255..5b5287981 100644 --- a/docker/keystone/keystone-ssh/Dockerfile.j2 +++ b/docker/keystone/keystone-ssh/Dockerfile.j2 @@ -5,7 +5,7 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} -{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} +{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set keystone_ssh_packages = [ 'openssh-server', 'rsync' |