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/cinder | |
| parent | 9779778a1ebc99b6a48a8d97282bf4d2d8f473d7 (diff) | |
| download | kolla-5cd30d491435b73a1cb7a2b8981de2c1f85761c7.tar.gz kolla-5cd30d491435b73a1cb7a2b8981de2c1f85761c7.zip | |
Remove Fedora support
Closes-bug: #1616387
Change-Id: Id97f88b9baa3d48d33ce120962450a374282d044
Diffstat (limited to 'docker/cinder')
| -rw-r--r-- | docker/cinder/cinder-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/cinder/cinder-backup/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/cinder/cinder-base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/cinder/cinder-rpcbind/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/cinder/cinder-volume/Dockerfile.j2 | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2 index 13756c997..fe343fea3 100644 --- a/docker/cinder/cinder-api/Dockerfile.j2 +++ b/docker/cinder/cinder-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 cinder_api_packages = [ 'python-keystone' diff --git a/docker/cinder/cinder-backup/Dockerfile.j2 b/docker/cinder/cinder-backup/Dockerfile.j2 index 773fc72fc..02a30c493 100644 --- a/docker/cinder/cinder-backup/Dockerfile.j2 +++ b/docker/cinder/cinder-backup/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 cinder_backup_packages = [ 'nfs-utils' @@ -22,7 +22,7 @@ MAINTAINER {{ maintainer }} {% endif %} {% elif install_type == 'source' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set cinder_backup_packages = [ 'nfs-utils' diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2 index b5b321cc4..8d59f5441 100644 --- a/docker/cinder/cinder-base/Dockerfile.j2 +++ b/docker/cinder/cinder-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 cinder_base_packages = [ 'openstack-cinder', @@ -28,7 +28,7 @@ MAINTAINER {{ maintainer }} {{ macros.install_packages(cinder_base_packages | customizable("packages")) }} {% elif install_type == 'source' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set cinder_base_packages = [ 'lvm2', diff --git a/docker/cinder/cinder-rpcbind/Dockerfile.j2 b/docker/cinder/cinder-rpcbind/Dockerfile.j2 index 6516b55ae..60eb8672b 100644 --- a/docker/cinder/cinder-rpcbind/Dockerfile.j2 +++ b/docker/cinder/cinder-rpcbind/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 cinder_rpcbind_packages = [ 'nfs-utils', diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2 index fd4f1c6bb..518daa4c3 100644 --- a/docker/cinder/cinder-volume/Dockerfile.j2 +++ b/docker/cinder/cinder-volume/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 cinder_volume_packages = [ 'scsi-target-utils' |