From a1b0518b9a2d8c1e1ba188e10a55915eb49f6509 Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Fri, 25 Sep 2015 20:08:40 +0000 Subject: 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 --- docker/openvswitch/ovs-db-server/Dockerfile.j2 | 1 - docker/openvswitch/ovs-vswitchd/Dockerfile.j2 | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'docker/openvswitch') 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"] -- cgit v1.2.3