diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-04 03:30:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-04 03:30:05 +0000 |
| commit | bf8d20826fe59a64a11f224578b36cedf72535e9 (patch) | |
| tree | 1b27198766671112501339868bd750f24d59573a /docker/common/swift/swift-proxy-server | |
| parent | eba77f7781eb30f6334dd253ae86c8ef50977c59 (diff) | |
| parent | 60b6c1d81e8735a50fcf776d5618d5b1dc82ff00 (diff) | |
| download | kolla-bf8d20826fe59a64a11f224578b36cedf72535e9.tar.gz kolla-bf8d20826fe59a64a11f224578b36cedf72535e9.zip | |
Merge "Add config-internal/config-external to Swift containers"
Diffstat (limited to 'docker/common/swift/swift-proxy-server')
| -rwxr-xr-x | docker/common/swift/swift-proxy-server/config-external.sh | 10 | ||||
| -rw-r--r-- | docker/common/swift/swift-proxy-server/config-internal.sh | 5 | ||||
| -rwxr-xr-x[-rw-r--r--] | docker/common/swift/swift-proxy-server/start.sh | 12 |
3 files changed, 25 insertions, 2 deletions
diff --git a/docker/common/swift/swift-proxy-server/config-external.sh b/docker/common/swift/swift-proxy-server/config-external.sh new file mode 100755 index 000000000..813462735 --- /dev/null +++ b/docker/common/swift/swift-proxy-server/config-external.sh @@ -0,0 +1,10 @@ +#!/bin/bash +SOURCE="/opt/kolla/swift-proxy-server/swift.conf" +TARGET="/etc/swift/swift.conf" +OWNER="swift" + +if [[ -f "$SOURCE" ]]; then + cp $SOURCE $TARGET + chown ${OWNER}: $TARGET + chmod 0644 $TARGET +fi diff --git a/docker/common/swift/swift-proxy-server/config-internal.sh b/docker/common/swift/swift-proxy-server/config-internal.sh new file mode 100644 index 000000000..3f387d187 --- /dev/null +++ b/docker/common/swift/swift-proxy-server/config-internal.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +sh /opt/swift/config-swift.sh proxy + +exec /usr/bin/swift-proxy-server diff --git a/docker/common/swift/swift-proxy-server/start.sh b/docker/common/swift/swift-proxy-server/start.sh index 3f387d187..8957b5052 100644..100755 --- a/docker/common/swift/swift-proxy-server/start.sh +++ b/docker/common/swift/swift-proxy-server/start.sh @@ -1,5 +1,13 @@ #!/bin/bash +set -o errexit -sh /opt/swift/config-swift.sh proxy +CMD="/usr/bin/swift-proxy-server" +ARGS="" -exec /usr/bin/swift-proxy-server +# Loading common functions. +source /opt/kolla/kolla-common.sh + +# Config-internal script exec out of this function, it does not return here. +set_configs + +exec $CMD $ARGS |
