diff options
| author | Zuul <zuul@review.opendev.org> | 2023-09-22 14:22:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-09-22 14:22:23 +0000 |
| commit | 91dcdeffb863f77fac6b640730a40cca28f0c47c (patch) | |
| tree | 1ee42168992bbec0ca465e8ed36324a16c945d90 | |
| parent | 899545f4e98f39ac33612f6468bb65457756f5be (diff) | |
| parent | dbc9b1193e4361bbab3742970ea268b5a419c911 (diff) | |
| download | kolla-91dcdeffb863f77fac6b640730a40cca28f0c47c.tar.gz kolla-91dcdeffb863f77fac6b640730a40cca28f0c47c.zip | |
Merge "Drop openvswitch-netcontrold"
3 files changed, 4 insertions, 38 deletions
diff --git a/docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2 b/docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2 deleted file mode 100644 index 7c72466d0..000000000 --- a/docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2 +++ /dev/null @@ -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 %} diff --git a/docker/openvswitch/openvswitch-netcontrold/extend_start.sh b/docker/openvswitch/openvswitch-netcontrold/extend_start.sh deleted file mode 100644 index 716cb126c..000000000 --- a/docker/openvswitch/openvswitch-netcontrold/extend_start.sh +++ /dev/null @@ -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 diff --git a/releasenotes/notes/remove-netcontrold-49754ae8febae5bc.yaml b/releasenotes/notes/remove-netcontrold-49754ae8febae5bc.yaml new file mode 100644 index 000000000..47ca0e361 --- /dev/null +++ b/releasenotes/notes/remove-netcontrold-49754ae8febae5bc.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + The ``openvswitch-netcontrold`` image has been dropped. |