diff options
| author | caoyuan <cao.yuan@99cloud.net> | 2016-11-29 17:03:01 +0800 |
|---|---|---|
| committer | caoyuan <cao.yuan@99cloud.net> | 2016-12-01 22:28:46 +0800 |
| commit | c68b233c8016e4bd82cdbcc3282074b43fddc833 (patch) | |
| tree | 90b9176bde0a4e8fac5c2fdaa17187d8771a4afb | |
| parent | 6b5becdfc790f8ac4c71748954ce55290219d8a2 (diff) | |
| download | kolla-c68b233c8016e4bd82cdbcc3282074b43fddc833.tar.gz kolla-c68b233c8016e4bd82cdbcc3282074b43fddc833.zip | |
Remove the "nova-network" container file
The nova-network service was deprecated, this patch to
remove nova-network container.
TrivialFix
Change-Id: I73b4215f7538570e1140780e9f52df9ca58e92ff
| -rw-r--r-- | docker/nova/nova-network/Dockerfile.j2 | 41 | ||||
| -rw-r--r-- | releasenotes/notes/remove-nova-network-container-69f8c0b61b3aed5a.yaml | 5 |
2 files changed, 5 insertions, 41 deletions
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 diff --git a/releasenotes/notes/remove-nova-network-container-69f8c0b61b3aed5a.yaml b/releasenotes/notes/remove-nova-network-container-69f8c0b61b3aed5a.yaml new file mode 100644 index 000000000..4c3edc81b --- /dev/null +++ b/releasenotes/notes/remove-nova-network-container-69f8c0b61b3aed5a.yaml @@ -0,0 +1,5 @@ +--- +deprecations: + - The nova-network service was deprecated, we remove it from + the nova container. + |