diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-04 13:39:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-04 13:39:07 +0000 |
| commit | d69ab19701a142fb654cdecb3d4fda09e098d7a8 (patch) | |
| tree | 26ae3e192aa88f123c65a2190810385c581643a7 /docker/keystone | |
| parent | d25ddf87f3f74c9889e303a9e139296fe70f04dc (diff) | |
| parent | 5cd30d491435b73a1cb7a2b8981de2c1f85761c7 (diff) | |
| download | kolla-d69ab19701a142fb654cdecb3d4fda09e098d7a8.tar.gz kolla-d69ab19701a142fb654cdecb3d4fda09e098d7a8.zip | |
Merge "Remove Fedora support"
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 28d6a0e1c..6a909a5d5 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' |