From 94162bd08f40ec742a7bfcdcd4aac45be5bd5618 Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Thu, 1 Oct 2015 07:43:18 +0000 Subject: Bring Kolla inline with FHS This brings Kolla images inline with FHS and should make finding locations of things more consistent and reliable with the linux world at large. Change-Id: Iece5b4da4bace0fb8b1f41a65ab2c852ec73e6f8 Closes-Bug: #1485742 --- docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'docker/openvswitch/openvswitch-vswitchd') diff --git a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 index bdb15a340..23fc8bde5 100644 --- a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 @@ -1,9 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) -COPY ovs_ensure_configured.sh /opt/kolla/ - +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 /opt/kolla/ovs_ensure_configured.sh +RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_ensure_openvswitch_configured {{ include_footer }} -- cgit v1.2.3