aboutsummaryrefslogtreecommitdiff
path: root/docker/centos/binary
diff options
context:
space:
mode:
authorSam Yaple <sam@yaple.net>2015-07-23 11:25:42 +0000
committerSam Yaple <sam@yaple.net>2015-07-23 12:15:31 +0000
commit77f71b9f59d2900d1536a2a72a01779a61d8fd94 (patch)
tree6dd84130bf7d8bc6daa45a8e3e10b46d55409e23 /docker/centos/binary
parent6d4a55060e13723138facd90dc9786e7f2c3684b (diff)
downloadkolla-77f71b9f59d2900d1536a2a72a01779a61d8fd94.tar.gz
kolla-77f71b9f59d2900d1536a2a72a01779a61d8fd94.zip
Adds the appropriate tools to addin the ovs bridge
Ansible will exec a script in the OVS container to ensure the bridge and ports are properly setup. The script is idempotent. Change-Id: I5adca595a4d2ef4edf26c9635cfa5ceb30ca4a59 Closes-Bug: #1466375
Diffstat (limited to 'docker/centos/binary')
-rw-r--r--docker/centos/binary/openvswitch/ovs-vswitchd/Dockerfile2
l---------docker/centos/binary/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh1
2 files changed, 2 insertions, 1 deletions
diff --git a/docker/centos/binary/openvswitch/ovs-vswitchd/Dockerfile b/docker/centos/binary/openvswitch/ovs-vswitchd/Dockerfile
index c34d72302..60989c846 100644
--- a/docker/centos/binary/openvswitch/ovs-vswitchd/Dockerfile
+++ b/docker/centos/binary/openvswitch/ovs-vswitchd/Dockerfile
@@ -3,6 +3,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
COPY ./start.sh /start.sh
-COPY config-internal.sh config-external.sh /opt/kolla/
+COPY ovs_ensure_configured.sh config-internal.sh config-external.sh /opt/kolla/
CMD ["/start.sh"]
diff --git a/docker/centos/binary/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh b/docker/centos/binary/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh
new file mode 120000
index 000000000..19efaf06a
--- /dev/null
+++ b/docker/centos/binary/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh
@@ -0,0 +1 @@
+../../../../common/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh \ No newline at end of file