From 9ce814619aa951f7d87b14f2ca67e7128ac12d2c Mon Sep 17 00:00:00 2001 From: Sean Mooney Date: Wed, 2 Dec 2015 21:05:16 +0000 Subject: 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 --- docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2') 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 }} -- cgit v1.2.3