diff options
| author | Sean Mooney <sean.k.mooney@intel.com> | 2015-12-02 21:05:16 +0000 |
|---|---|---|
| committer | Sean Mooney <sean.k.mooney@intel.com> | 2015-12-03 20:13:21 +0000 |
| commit | 9ce814619aa951f7d87b14f2ca67e7128ac12d2c (patch) | |
| tree | c493702ac895dbb80cd2d6871de5dbe1b1feae0a /docker/openvswitch/openvswitch-vswitchd | |
| parent | cb73c6b7c04ffa48d5ee32793b3b5f11f0092caa (diff) | |
| download | kolla-9ce814619aa951f7d87b14f2ca67e7128ac12d2c.tar.gz kolla-9ce814619aa951f7d87b14f2ca67e7128ac12d2c.zip | |
configure ovs bridge in openvswitch-db container
- this change moves the ovs_ensure_configured.sh file to the
openvswitch-db container.
- this change reorders the plays in ansible/roles/neutron/tasks/start.yml
to configure the ovs bridges before starting the vswitchd container.
Change-Id: Ied1a82d48377534c15680406df9a96caf3b79515
Closes-Bug: #1522133
Diffstat (limited to 'docker/openvswitch/openvswitch-vswitchd')
| -rw-r--r-- | docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/openvswitch/openvswitch-vswitchd/ovs_ensure_configured.sh | 17 |
2 files changed, 1 insertions, 19 deletions
diff --git a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 index 43f3ca55e..8692f8cee 100644 --- a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 @@ -1,8 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }} MAINTAINER {{ maintainer }} -COPY ovs_ensure_configured.sh /usr/local/bin/kolla_ensure_openvswitch_configured COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_ensure_openvswitch_configured +RUN chmod 755 /usr/local/bin/kolla_extend_start {{ include_footer }} diff --git a/docker/openvswitch/openvswitch-vswitchd/ovs_ensure_configured.sh b/docker/openvswitch/openvswitch-vswitchd/ovs_ensure_configured.sh deleted file mode 100644 index c39d64ff7..000000000 --- a/docker/openvswitch/openvswitch-vswitchd/ovs_ensure_configured.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -bridge=$1 -port=$2 - -ovs-vsctl br-exists $bridge; rc=$? -if [[ $rc == 2 ]]; then - changed=changed - ovs-vsctl add-br $bridge -fi - -if [[ ! $(ovs-vsctl list-ports $bridge) =~ $(echo "\<$port\>") ]]; then - changed=changed - ovs-vsctl add-port $bridge $port -fi - -echo $changed |