diff options
| author | Sam Yaple <sam@yaple.net> | 2015-08-07 17:28:16 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-08-07 17:48:46 +0000 |
| commit | 5f16da8aa5f493acb890ba8acfe6d5e0d4d80dec (patch) | |
| tree | 9e298c90e340ee6fadfe9eb0bb85b25129b3b697 /docker/common/swift/swift-object-replicator | |
| parent | a5e907a8e91bc4e1d8f563dc79db0ee96c15d380 (diff) | |
| download | kolla-5f16da8aa5f493acb890ba8acfe6d5e0d4d80dec.tar.gz kolla-5f16da8aa5f493acb890ba8acfe6d5e0d4d80dec.zip | |
Remove config-internal for swift
Change-Id: I07e105a5638ad9fde67e58bf371dffda64563a53
Partially-Implements: blueprint remove-config-internal
Diffstat (limited to 'docker/common/swift/swift-object-replicator')
| -rwxr-xr-x | docker/common/swift/swift-object-replicator/config-internal.sh | 11 | ||||
| -rwxr-xr-x | docker/common/swift/swift-object-replicator/start.sh | 2 |
2 files changed, 1 insertions, 12 deletions
diff --git a/docker/common/swift/swift-object-replicator/config-internal.sh b/docker/common/swift/swift-object-replicator/config-internal.sh deleted file mode 100755 index 101fa90f8..000000000 --- a/docker/common/swift/swift-object-replicator/config-internal.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -set -e - -CMD="/usr/bin/swift-object-replicator" -ARGS="/etc/swift/object-server.conf --verbose" - -. /opt/kolla/config-swift.sh -. /opt/kolla/config-swift-object.sh - -exec $CMD $ARGS diff --git a/docker/common/swift/swift-object-replicator/start.sh b/docker/common/swift/swift-object-replicator/start.sh index e6049717a..409661c6f 100755 --- a/docker/common/swift/swift-object-replicator/start.sh +++ b/docker/common/swift/swift-object-replicator/start.sh @@ -8,7 +8,7 @@ ARGS="/etc/swift/object-server.conf --verbose" # Loading common functions. source /opt/kolla/kolla-common.sh -# Config-internal script exec out of this function, it does not return here. +# Execute config strategy set_configs exec $CMD $ARGS |