aboutsummaryrefslogtreecommitdiff
path: root/docker/openvswitch
diff options
context:
space:
mode:
authorSam Yaple <sam@yaple.net>2015-09-25 20:08:40 +0000
committerSam Yaple <sam@yaple.net>2015-09-25 20:08:40 +0000
commita1b0518b9a2d8c1e1ba188e10a55915eb49f6509 (patch)
treead25628eb5ccc7f0c1e915da13db1ee9fc984648 /docker/openvswitch
parente4cc27ff4278a62981da435ad7d7dcee6158b1f2 (diff)
downloadkolla-a1b0518b9a2d8c1e1ba188e10a55915eb49f6509.tar.gz
kolla-a1b0518b9a2d8c1e1ba188e10a55915eb49f6509.zip
Fix removal of config-external
I removed the files but not the COPY commands thus breaking all of Kolla Change-Id: I37d3e0cb94a1ecc12971f485f953310ba8fee53c Partially-Implements: blueprint replace-config-external
Diffstat (limited to 'docker/openvswitch')
-rw-r--r--docker/openvswitch/ovs-db-server/Dockerfile.j21
-rw-r--r--docker/openvswitch/ovs-vswitchd/Dockerfile.j22
2 files changed, 1 insertions, 2 deletions
diff --git a/docker/openvswitch/ovs-db-server/Dockerfile.j2 b/docker/openvswitch/ovs-db-server/Dockerfile.j2
index 05c6a928b..bec5a8f12 100644
--- a/docker/openvswitch/ovs-db-server/Dockerfile.j2
+++ b/docker/openvswitch/ovs-db-server/Dockerfile.j2
@@ -2,7 +2,6 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ovs-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla)
COPY start.sh /
-COPY config-external.sh /opt/kolla/
CMD ["/start.sh"]
diff --git a/docker/openvswitch/ovs-vswitchd/Dockerfile.j2 b/docker/openvswitch/ovs-vswitchd/Dockerfile.j2
index 59079d335..14b3d08a9 100644
--- a/docker/openvswitch/ovs-vswitchd/Dockerfile.j2
+++ b/docker/openvswitch/ovs-vswitchd/Dockerfile.j2
@@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ovs-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla)
COPY start.sh /
-COPY ovs_ensure_configured.sh config-external.sh /opt/kolla/
+COPY ovs_ensure_configured.sh /opt/kolla/
CMD ["/start.sh"]