Merge "openvswitch: Drop ovs_ensure_configured.sh"

docker/openvswitch/openvswitch-db-server/Dockerfile.j2

@@ -5,10 +5,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% block openvswitch_db_server_header %}{% endblock %}
 
-COPY ovs_ensure_configured.sh /usr/local/bin/kolla_ensure_openvswitch_configured
 COPY extend_start.sh /usr/local/bin/kolla_openvswitch_extend_start
-RUN chmod 755 /usr/local/bin/kolla_ensure_openvswitch_configured \
+RUN chmod 755 /usr/local/bin/kolla_openvswitch_extend_start
-              /usr/local/bin/kolla_openvswitch_extend_start
 
 {% block openvswitch_db_server_footer %}{% endblock %}
 {% block footer %}{% endblock %}

docker/openvswitch/openvswitch-db-server/ovs_ensure_configured.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-bridge=$1
-port=$2
-
-if ! ip link show $port; then
-    # fail when device doesn't exist
-    exit 1
-fi
-
-ovs-vsctl br-exists $bridge || if [[ $? -eq 2 ]]; then
-    changed=changed
-    ovs-vsctl --no-wait add-br $bridge
-fi
-
-if [[ ! $(ovs-vsctl list-ports $bridge) =~ $(echo "\<$port\>") ]]; then
-    changed=changed
-    ovs-vsctl --no-wait add-port $bridge $port
-fi
-
-echo $changed

docker/openvswitch/openvswitch-db-server/releasenotes/notes/drop-ovs-ensure-configured-7973d36969e157fa.yaml

@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    ``openvswitch`` script ``ovs_ensure_configured.sh`` has been dropped after
+    being replaced with Ansible modules in ``kolla-ansible``.