From c68b233c8016e4bd82cdbcc3282074b43fddc833 Mon Sep 17 00:00:00 2001 From: caoyuan Date: Tue, 29 Nov 2016 17:03:01 +0800 Subject: Remove the "nova-network" container file The nova-network service was deprecated, this patch to remove nova-network container. TrivialFix Change-Id: I73b4215f7538570e1140780e9f52df9ca58e92ff --- docker/nova/nova-network/Dockerfile.j2 | 41 ---------------------------------- 1 file changed, 41 deletions(-) delete mode 100644 docker/nova/nova-network/Dockerfile.j2 (limited to 'docker/nova') diff --git a/docker/nova/nova-network/Dockerfile.j2 b/docker/nova/nova-network/Dockerfile.j2 deleted file mode 100644 index d6f4aeb08..000000000 --- a/docker/nova/nova-network/Dockerfile.j2 +++ /dev/null @@ -1,41 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} -MAINTAINER {{ maintainer }} - -{% block nova_network_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% if install_type == 'binary' %} - {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} - - {% set nova_network_packages = [ - 'openstack-nova-network', - 'bridge-utils', - 'initscripts' - ] %} - - {% elif base_distro in ['ubuntu'] %} - - {% set nova_network_packages = [ - 'nova-network' - ] %} - - {% endif %} -{% elif install_type == 'source' %} - {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} - - {% set nova_network_packages = [ - 'initscripts' - ] %} - - {% endif %} - -{{ macros.install_packages(nova_network_packages | customizable("packages")) }} - -{% endif %} - -{% block nova_network_footer %}{% endblock %} -{% block footer %}{% endblock %} -{{ include_footer }} - -USER nova -- cgit v1.2.3