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/magnum | |
| parent | 9779778a1ebc99b6a48a8d97282bf4d2d8f473d7 (diff) | |
| download | kolla-5cd30d491435b73a1cb7a2b8981de2c1f85761c7.tar.gz kolla-5cd30d491435b73a1cb7a2b8981de2c1f85761c7.zip | |
Remove Fedora support
Closes-bug: #1616387
Change-Id: Id97f88b9baa3d48d33ce120962450a374282d044
Diffstat (limited to 'docker/magnum')
| -rw-r--r-- | docker/magnum/magnum-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/magnum/magnum-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/magnum/magnum-conductor/Dockerfile.j2 | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docker/magnum/magnum-api/Dockerfile.j2 b/docker/magnum/magnum-api/Dockerfile.j2 index e1f2285e6..a09c057cb 100644 --- a/docker/magnum/magnum-api/Dockerfile.j2 +++ b/docker/magnum/magnum-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 magnum_api_packages = ['openstack-magnum-api'] %} {% elif base_distro in ['ubuntu'] %} {% set magnum_api_packages = ['magnum-api'] %} diff --git a/docker/magnum/magnum-base/Dockerfile.j2 b/docker/magnum/magnum-base/Dockerfile.j2 index 32b597289..74a4006ef 100644 --- a/docker/magnum/magnum-base/Dockerfile.j2 +++ b/docker/magnum/magnum-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'] %} + {% if base_distro in ['centos', 'oraclelinux'] %} {% set magnum_base_packages = ['openstack-magnum-common'] %} RUN curl -L https://trunk.rdoproject.org/centos7/current/delorean.repo -o /etc/yum.repos.d/delorean.repo diff --git a/docker/magnum/magnum-conductor/Dockerfile.j2 b/docker/magnum/magnum-conductor/Dockerfile.j2 index b4d3f5fd3..080ef693b 100644 --- a/docker/magnum/magnum-conductor/Dockerfile.j2 +++ b/docker/magnum/magnum-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 magnum_conductor_packages = [ 'openstack-magnum-conductor' ] %} |