diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-02 21:39:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-02 21:39:07 +0000 |
| commit | 262e880b86b38d87866c7a61b0aaae8cd6ff81eb (patch) | |
| tree | 42672632b5c6a1276925853015b9f1419a53ef7b /docker/swift/swift-proxy-server | |
| parent | 572e80e6d081ae1d42998b5a4cb3fcaa9b6b2a48 (diff) | |
| parent | b209da1306c454366210e88f5a7a0e14bdd88fc4 (diff) | |
| download | kolla-262e880b86b38d87866c7a61b0aaae8cd6ff81eb.tar.gz kolla-262e880b86b38d87866c7a61b0aaae8cd6ff81eb.zip | |
Merge "Fix Swift for multinode P+ACO deployment"
Diffstat (limited to 'docker/swift/swift-proxy-server')
| -rw-r--r-- | docker/swift/swift-proxy-server/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/swift/swift-proxy-server/extend_start.sh | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/docker/swift/swift-proxy-server/Dockerfile.j2 b/docker/swift/swift-proxy-server/Dockerfile.j2 index 898103d5e..8d8f73977 100644 --- a/docker/swift/swift-proxy-server/Dockerfile.j2 +++ b/docker/swift/swift-proxy-server/Dockerfile.j2 @@ -10,7 +10,4 @@ RUN yum -y install openstack-swift-proxy \ {% endif %} {% endif %} -COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 755 /usr/local/bin/kolla_extend_start - {{ include_footer }} diff --git a/docker/swift/swift-proxy-server/extend_start.sh b/docker/swift/swift-proxy-server/extend_start.sh deleted file mode 100644 index 8fce9c154..000000000 --- a/docker/swift/swift-proxy-server/extend_start.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -source /usr/local/bin/kolla_config_swift |
