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/trove | |
| parent | 9779778a1ebc99b6a48a8d97282bf4d2d8f473d7 (diff) | |
| download | kolla-5cd30d491435b73a1cb7a2b8981de2c1f85761c7.tar.gz kolla-5cd30d491435b73a1cb7a2b8981de2c1f85761c7.zip | |
Remove Fedora support
Closes-bug: #1616387
Change-Id: Id97f88b9baa3d48d33ce120962450a374282d044
Diffstat (limited to 'docker/trove')
| -rw-r--r-- | docker/trove/trove-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/trove/trove-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/trove/trove-conductor/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/trove/trove-guestagent/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/trove/trove-taskmanager/Dockerfile.j2 | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/docker/trove/trove-api/Dockerfile.j2 b/docker/trove/trove-api/Dockerfile.j2 index d4e09e0a6..210dffa37 100644 --- a/docker/trove/trove-api/Dockerfile.j2 +++ b/docker/trove/trove-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 trove_api_packages = ['openstack-trove-api'] %} {% elif base_distro in ['ubuntu'] %} {% set trove_api_packages = ['trove-api'] %} diff --git a/docker/trove/trove-base/Dockerfile.j2 b/docker/trove/trove-base/Dockerfile.j2 index e09bda1d2..a946162dd 100644 --- a/docker/trove/trove-base/Dockerfile.j2 +++ b/docker/trove/trove-base/Dockerfile.j2 @@ -7,7 +7,7 @@ MAINTAINER {{ maintainer }} {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set trove_base_packages = ['openstack-trove-common'] %} {% elif base_distro in ['ubuntu'] %} {% set trove_base_packages = ['trove-common'] %} diff --git a/docker/trove/trove-conductor/Dockerfile.j2 b/docker/trove/trove-conductor/Dockerfile.j2 index cc7adfe58..0941fae5f 100644 --- a/docker/trove/trove-conductor/Dockerfile.j2 +++ b/docker/trove/trove-conductor/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 trove_conductor_packages = ['openstack-trove-conductor'] %} {% elif base_distro in ['ubuntu'] %} {% set trove_conductor_packages = ['trove-conductor'] %} diff --git a/docker/trove/trove-guestagent/Dockerfile.j2 b/docker/trove/trove-guestagent/Dockerfile.j2 index 174cf22ac..bcbe9aa5a 100644 --- a/docker/trove/trove-guestagent/Dockerfile.j2 +++ b/docker/trove/trove-guestagent/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 trove_guestagent_packages = ['openstack-trove-guestagent'] %} {% elif base_distro in ['ubuntu'] %} {% set trove_guestagent_packages = ['trove-guestagent'] %} diff --git a/docker/trove/trove-taskmanager/Dockerfile.j2 b/docker/trove/trove-taskmanager/Dockerfile.j2 index 3ac251b31..f59426646 100644 --- a/docker/trove/trove-taskmanager/Dockerfile.j2 +++ b/docker/trove/trove-taskmanager/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 trove_taskmanager_packages = ['openstack-trove-taskmanager'] %} {% elif base_distro in ['ubuntu'] %} {% set trove_taskmanager_packages = ['trove-taskmanager'] %} |
