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/swift/swift-base/Dockerfile.j2 | 3 ++- docker/swift/swift-proxy-server/extend_start.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'docker/swift') diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2 index 8a9747d2a..192e9821c 100644 --- a/docker/swift/swift-base/Dockerfile.j2 +++ b/docker/swift/swift-base/Dockerfile.j2 @@ -20,5 +20,6 @@ RUN ln -s swift-base-source/* swift \ {% endif %} -COPY config-swift.sh build-swift-ring.py /opt/kolla/ +COPY config-swift.sh /usr/local/bin/kolla_config_swift +COPY build-swift-ring.py /usr/local/bin/kolla_build_swift_ring RUN mkdir /opt/swift diff --git a/docker/swift/swift-proxy-server/extend_start.sh b/docker/swift/swift-proxy-server/extend_start.sh index 78afd2e99..8fce9c154 100644 --- a/docker/swift/swift-proxy-server/extend_start.sh +++ b/docker/swift/swift-proxy-server/extend_start.sh @@ -1,3 +1,3 @@ #!/bin/bash -source /opt/kolla/config-swift.sh +source /usr/local/bin/kolla_config_swift -- cgit v1.2.3