Remove the "nova-network" container file

The nova-network service was deprecated, this patch to
remove nova-network container.
TrivialFix

Change-Id: I73b4215f7538570e1140780e9f52df9ca58e92ff
This commit is contained in:
caoyuan 2016-11-29 17:03:01 +08:00
parent 6b5becdfc7
commit c68b233c80
2 changed files with 5 additions and 41 deletions

View File

@ -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

View File

@ -0,0 +1,5 @@
---
deprecations:
- The nova-network service was deprecated, we remove it from
the nova container.