diff options
Diffstat (limited to 'docker/openvswitch')
8 files changed, 0 insertions, 136 deletions
diff --git a/docker/openvswitch/openvswitch-base/Dockerfile.j2 b/docker/openvswitch/openvswitch-base/Dockerfile.j2 deleted file mode 100644 index 44d8df41c..000000000 --- a/docker/openvswitch/openvswitch-base/Dockerfile.j2 +++ /dev/null @@ -1,45 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" -{% endblock %} - -{% block openvswitch_base_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% block ovs_install %} - -{% if base_package_type == 'rpm' %} - -{{ macros.enable_extra_repos(['openvswitch']) }} - - {% set openvswitch_base_packages = [ - 'libibverbs', - 'openvswitch${KOLLA_RPM_OVS_VERSION}', - 'python3-openvswitch${KOLLA_RPM_OVS_VERSION}', - 'tcpdump' - ] %} -{% elif base_package_type == 'deb' %} - {% set openvswitch_base_packages = [ - 'openvswitch-switch', - 'python3-openvswitch', - 'tcpdump' - ] %} -{% endif %} - -{{ macros.install_packages(openvswitch_base_packages | customizable("packages")) }} - -{% endblock %} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start -COPY ovs_wrapper.sh /usr/local/bin/ovs_wrapper - -# NOTE(hrw): Upstream moved tcpdump to /usr/bin/ in 4.99 version (used in Debian) -RUN if [ -e /usr/sbin/tcpdump ]; then mv /usr/sbin/tcpdump /usr/bin/tcpdump; fi \ - && touch /usr/local/bin/kolla_openvswitch_extend_start \ - && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_openvswitch_extend_start \ - && chmod 755 /usr/local/bin/ovs_wrapper - -{{ macros.kolla_patch_sources() }} - -{% block openvswitch_base_footer %}{% endblock %} diff --git a/docker/openvswitch/openvswitch-base/extend_start.sh b/docker/openvswitch/openvswitch-base/extend_start.sh deleted file mode 100644 index 1b0ed1300..000000000 --- a/docker/openvswitch/openvswitch-base/extend_start.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -if [[ ! -d "/var/log/kolla/openvswitch" ]]; then - mkdir -p /var/log/kolla/openvswitch -fi -if [[ $(stat -c %a /var/log/kolla/openvswitch) != "755" ]]; then - chmod 755 /var/log/kolla/openvswitch -fi - -chown -R openvswitch:openvswitch /var/log/kolla/openvswitch - -. /usr/local/bin/kolla_openvswitch_extend_start diff --git a/docker/openvswitch/openvswitch-base/ovs_wrapper.sh b/docker/openvswitch/openvswitch-base/ovs_wrapper.sh deleted file mode 100644 index 552c496ac..000000000 --- a/docker/openvswitch/openvswitch-base/ovs_wrapper.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -catch_term() { - ovs-appctl -T1 -t /run/openvswitch/$1.$child.ctl exit - exit 0 -} - -catch_quit() { - ovs-appctl -T1 -t /run/openvswitch/$1.$child.ctl exit - exit 0 -} - -trap catch_term SIGTERM -trap catch_quit SIGQUIT - -"$@" & - -child=$! -wait "$child" diff --git a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 deleted file mode 100644 index 869dbabb6..000000000 --- a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 +++ /dev/null @@ -1,16 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" -{% endblock %} - -{% block openvswitch_db_server_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -COPY extend_start.sh /usr/local/bin/kolla_openvswitch_extend_start -RUN chmod 755 /usr/local/bin/kolla_openvswitch_extend_start - -{{ macros.kolla_patch_sources() }} - -{% block openvswitch_db_server_footer %}{% endblock %} -{% block footer %}{% endblock %} diff --git a/docker/openvswitch/openvswitch-db-server/extend_start.sh b/docker/openvswitch/openvswitch-db-server/extend_start.sh deleted file mode 100644 index d25038bdd..000000000 --- a/docker/openvswitch/openvswitch-db-server/extend_start.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -mkdir -p "/run/openvswitch" -if [[ ! -e "/var/lib/openvswitch/conf.db" ]]; then - ovsdb-tool create "/var/lib/openvswitch/conf.db" -fi - -if [[ $(ovsdb-tool needs-conversion /var/lib/openvswitch/conf.db) == yes ]]; then - ovsdb-tool convert "/var/lib/openvswitch/conf.db" -fi - -if [[ ! -r "/var/log/kolla/openvswitch/ovsdb-server.log" ]]; then - touch /var/log/kolla/openvswitch/ovsdb-server.log - chown openvswitch:openvswitch /var/log/kolla/openvswitch/ovsdb-server.log -fi diff --git a/docker/openvswitch/openvswitch-db-server/releasenotes/notes/drop-ovs-ensure-configured-7973d36969e157fa.yaml b/docker/openvswitch/openvswitch-db-server/releasenotes/notes/drop-ovs-ensure-configured-7973d36969e157fa.yaml deleted file mode 100644 index cc8daf1f4..000000000 --- a/docker/openvswitch/openvswitch-db-server/releasenotes/notes/drop-ovs-ensure-configured-7973d36969e157fa.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -upgrade: - - | - ``openvswitch`` script ``ovs_ensure_configured.sh`` has been dropped after - being replaced with Ansible modules in ``kolla-ansible``. diff --git a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 deleted file mode 100644 index fe6dd4347..000000000 --- a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 +++ /dev/null @@ -1,16 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" -{% endblock %} - -{% block openvswitch_vswitchd_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -COPY extend_start.sh /usr/local/bin/kolla_openvswitch_extend_start -RUN chmod 644 /usr/local/bin/kolla_openvswitch_extend_start - -{{ macros.kolla_patch_sources() }} - -{% block openvswitch_vswitchd_footer %}{% endblock %} -{% block footer %}{% endblock %} diff --git a/docker/openvswitch/openvswitch-vswitchd/extend_start.sh b/docker/openvswitch/openvswitch-vswitchd/extend_start.sh deleted file mode 100644 index fde542130..000000000 --- a/docker/openvswitch/openvswitch-vswitchd/extend_start.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -if [[ ! -r "/var/log/kolla/openvswitch/ovs-vswitchd.log" ]]; then - touch /var/log/kolla/openvswitch/ovs-vswitchd.log - chown openvswitch:openvswitch /var/log/kolla/openvswitch/ovs-vswitchd.log -fi - -modprobe openvswitch |