openstack
/
kolla
Code Issues Proposed changes

Drop openvswitch-netcontrold 

Closes-Bug: #2027668

Change-Id: Ib8cd2356c6e4cdf7b2108a7fdedcb5a4b02768ca
This commit is contained in:
Michal Nasiadka 2023-08-17 09:08:30 +02:00 committed by Maksim Malchuk
parent 7f12d216dc
commit dbc9b1193e
3 changed files with 4 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2
View File

@ -1,31 +0,0 @@
FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }}
{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
{% endblock %}
{% block openvswitch_netcontrold_header %}{% endblock %}
{% import "macros.j2" as macros with context %}
{% block openvswitch_netcontrold_install %}
{% set openvswitch_netcontrold_packages = [
] %}
{{ macros.install_packages(openvswitch_netcontrold_packages | customizable("packages")) }}
{% set openvswitch_netcontrold_pip_packages = [
'netcontrold',
]
%}
RUN {{ macros.install_pip(['pip', 'wheel', 'setuptools'], constraints=false) }} \
&& {{ macros.install_pip(openvswitch_netcontrold_pip_packages | customizable("pip_packages"), constraints = false) }}
{% endblock %}
COPY extend_start.sh /usr/local/bin/kolla_openvswitch_extend_start
RUN chmod 644 /usr/local/bin/kolla_openvswitch_extend_start
{% block openvswitch_netcontrold_footer %}{% endblock %}
{% block footer %}{% endblock %}

7
docker/openvswitch/openvswitch-netcontrold/extend_start.sh
View File

@ -1,7 +0,0 @@
#!/bin/bash
if [[ ! -d "/var/log/kolla/openvswitch/netcontrold" ]]; then
mkdir -p /var/log/kolla/openvswitch/netcontrold
fi
if [[ $(stat -c %a /var/log/kolla/openvswitch/netcontrold) != "755" ]]; then
chmod 755 /var/log/kolla/openvswitch/netcontrold
fi

4
releasenotes/notes/remove-netcontrold-49754ae8febae5bc.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- |
The ``openvswitch-netcontrold`` image has been dropped.