From dbc9b1193e4361bbab3742970ea268b5a419c911 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Thu, 17 Aug 2023 09:08:30 +0200 Subject: Drop openvswitch-netcontrold Closes-Bug: #2027668 Change-Id: Ib8cd2356c6e4cdf7b2108a7fdedcb5a4b02768ca --- .../openvswitch-netcontrold/Dockerfile.j2 | 31 ---------------------- .../openvswitch-netcontrold/extend_start.sh | 7 ----- 2 files changed, 38 deletions(-) delete mode 100644 docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2 delete mode 100644 docker/openvswitch/openvswitch-netcontrold/extend_start.sh (limited to 'docker') 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 -- cgit v1.2.3