aboutsummaryrefslogtreecommitdiff
path: root/docker/nova
diff options
context:
space:
mode:
authorChristian Berendt <berendt@betacloud-solutions.de>2016-11-03 10:37:21 +0100
committerChristian Berendt <berendt@betacloud-solutions.de>2016-11-03 10:50:22 +0100
commit5cd30d491435b73a1cb7a2b8981de2c1f85761c7 (patch)
treea579e2780c5546cc372d3030fd4851f389019cea /docker/nova
parent9779778a1ebc99b6a48a8d97282bf4d2d8f473d7 (diff)
downloadkolla-5cd30d491435b73a1cb7a2b8981de2c1f85761c7.tar.gz
kolla-5cd30d491435b73a1cb7a2b8981de2c1f85761c7.zip
Remove Fedora support
Closes-bug: #1616387 Change-Id: Id97f88b9baa3d48d33ce120962450a374282d044
Diffstat (limited to 'docker/nova')
-rw-r--r--docker/nova/nova-api/Dockerfile.j22
-rw-r--r--docker/nova/nova-base/Dockerfile.j24
-rw-r--r--docker/nova/nova-compute-ironic/Dockerfile.j22
-rw-r--r--docker/nova/nova-compute/Dockerfile.j24
-rw-r--r--docker/nova/nova-conductor/Dockerfile.j22
-rw-r--r--docker/nova/nova-consoleauth/Dockerfile.j22
-rw-r--r--docker/nova/nova-libvirt/Dockerfile.j24
-rw-r--r--docker/nova/nova-network/Dockerfile.j24
-rw-r--r--docker/nova/nova-novncproxy/Dockerfile.j22
-rw-r--r--docker/nova/nova-scheduler/Dockerfile.j22
-rw-r--r--docker/nova/nova-serialproxy/Dockerfile.j22
-rw-r--r--docker/nova/nova-spicehtml5proxy/Dockerfile.j22
12 files changed, 16 insertions, 16 deletions
diff --git a/docker/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2
index 869a9801d..13a3dd92c 100644
--- a/docker/nova/nova-api/Dockerfile.j2
+++ b/docker/nova/nova-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 nova_api_packages = [
'openstack-nova-api'
diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2
index 3382975ee..7f8570693 100644
--- a/docker/nova/nova-base/Dockerfile.j2
+++ b/docker/nova/nova-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 nova_base_packages = [
'openstack-nova-common',
@@ -30,7 +30,7 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(nova_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
- {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+ {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set nova_base_packages = [
'bridge-utils',
diff --git a/docker/nova/nova-compute-ironic/Dockerfile.j2 b/docker/nova/nova-compute-ironic/Dockerfile.j2
index 03176db83..1fd22cef8 100644
--- a/docker/nova/nova-compute-ironic/Dockerfile.j2
+++ b/docker/nova/nova-compute-ironic/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 nova_compute_ironic_packages = [
'openstack-nova-compute'
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
index ed832f441..461f8b155 100644
--- a/docker/nova/nova-compute/Dockerfile.j2
+++ b/docker/nova/nova-compute/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 nova_compute_packages = [
'openstack-nova-compute',
@@ -43,7 +43,7 @@ RUN rm -f /etc/nova/nova-compute.conf
{% endif %}
{% elif install_type == 'source' %}
- {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+ {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set nova_compute_packages = [
'libvirt-devel',
diff --git a/docker/nova/nova-conductor/Dockerfile.j2 b/docker/nova/nova-conductor/Dockerfile.j2
index c666359d1..ebb61a67a 100644
--- a/docker/nova/nova-conductor/Dockerfile.j2
+++ b/docker/nova/nova-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 nova_conductor_packages = [
'openstack-nova-conductor'
diff --git a/docker/nova/nova-consoleauth/Dockerfile.j2 b/docker/nova/nova-consoleauth/Dockerfile.j2
index 68173e23b..e5a8ad5c4 100644
--- a/docker/nova/nova-consoleauth/Dockerfile.j2
+++ b/docker/nova/nova-consoleauth/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 nova_consoleauth_packages = [
'openstack-nova-console'
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2
index 1d05dfcda..7fa39f819 100644
--- a/docker/nova/nova-libvirt/Dockerfile.j2
+++ b/docker/nova/nova-libvirt/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 nova_libvirt_packages = [
'libvirt-daemon',
@@ -52,7 +52,7 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(nova_libvirt_packages | customizable("packages")) }}
-{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
RUN usermod -a -G qemu nova
diff --git a/docker/nova/nova-network/Dockerfile.j2 b/docker/nova/nova-network/Dockerfile.j2
index 33cd477a3..d6f4aeb08 100644
--- a/docker/nova/nova-network/Dockerfile.j2
+++ b/docker/nova/nova-network/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 nova_network_packages = [
'openstack-nova-network',
@@ -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 nova_network_packages = [
'initscripts'
diff --git a/docker/nova/nova-novncproxy/Dockerfile.j2 b/docker/nova/nova-novncproxy/Dockerfile.j2
index c5ed90a84..7aa8c4657 100644
--- a/docker/nova/nova-novncproxy/Dockerfile.j2
+++ b/docker/nova/nova-novncproxy/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 nova_novncproxy_packages = [
'novnc',
diff --git a/docker/nova/nova-scheduler/Dockerfile.j2 b/docker/nova/nova-scheduler/Dockerfile.j2
index 4b2164625..edd49883c 100644
--- a/docker/nova/nova-scheduler/Dockerfile.j2
+++ b/docker/nova/nova-scheduler/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 nova_scheduler_packages = [
'openstack-nova-scheduler'
diff --git a/docker/nova/nova-serialproxy/Dockerfile.j2 b/docker/nova/nova-serialproxy/Dockerfile.j2
index 0cf97de29..025a888a1 100644
--- a/docker/nova/nova-serialproxy/Dockerfile.j2
+++ b/docker/nova/nova-serialproxy/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 nova_serialproxy_packages = [
'openstack-nova-serialproxy'
] %}
diff --git a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2
index 994915cff..5a46df891 100644
--- a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2
+++ b/docker/nova/nova-spicehtml5proxy/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 nova_spicehtml5proxy_packages = [
'openstack-nova-spicehtml5proxy',