diff options
| author | Zuul <zuul@review.opendev.org> | 2024-09-13 08:33:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-09-13 08:33:51 +0000 |
| commit | 8bc94e6dca93565aa878b8464234fda207e47c1f (patch) | |
| tree | 8d1690149f5c25be7eb6fb72e03cd00f62f66b3b | |
| parent | c4b12b1ace851b719d63d696ae6a221d535876fb (diff) | |
| parent | c66a2cd63bd87b7052e4b76595e5e0a5f807eabd (diff) | |
| download | kolla-8bc94e6dca93565aa878b8464234fda207e47c1f.tar.gz kolla-8bc94e6dca93565aa878b8464234fda207e47c1f.zip | |
Merge "openvswitch: Drop ovs_ensure_configured.sh"
3 files changed, 6 insertions, 25 deletions
diff --git a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 index b82a18d20..f04cd71ec 100644 --- a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 +++ b/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 \ - /usr/local/bin/kolla_openvswitch_extend_start +RUN chmod 755 /usr/local/bin/kolla_openvswitch_extend_start {% block openvswitch_db_server_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/openvswitch/openvswitch-db-server/ovs_ensure_configured.sh b/docker/openvswitch/openvswitch-db-server/ovs_ensure_configured.sh deleted file mode 100644 index 6fada1031..000000000 --- a/docker/openvswitch/openvswitch-db-server/ovs_ensure_configured.sh +++ /dev/null @@ -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 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 new file mode 100644 index 000000000..cc8daf1f4 --- /dev/null +++ b/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``. |