diff options
Diffstat (limited to 'docker/swift/swift-object-replicator')
| -rw-r--r-- | docker/swift/swift-object-replicator/config-external.sh | 33 | ||||
| -rwxr-xr-x | docker/swift/swift-object-replicator/start.sh | 4 |
2 files changed, 22 insertions, 15 deletions
diff --git a/docker/swift/swift-object-replicator/config-external.sh b/docker/swift/swift-object-replicator/config-external.sh index 0fa02e985..827721088 100644 --- a/docker/swift/swift-object-replicator/config-external.sh +++ b/docker/swift/swift-object-replicator/config-external.sh @@ -1,18 +1,27 @@ #!/bin/bash -SOURCE="/opt/kolla/swift/swift.conf" -TARGET="/etc/swift/swift.conf" -SOURCE_OBJECT_SERVER="/opt/kolla/swift/object-server.conf" -TARGET_OBJECT_SERVER="/etc/swift/object-server.conf" + OWNER="swift" -if [[ -f "$SOURCE" ]]; then - cp $SOURCE $TARGET - chown ${OWNER}: $TARGET - chmod 0640 $TARGET +if [[ -f "/opt/kolla/swift/swift.conf" ]]; then + cp /opt/kolla/swift/swift.conf /etc/swift/swift.conf + chown ${OWNER}: /etc/swift/swift.conf + chmod 0640 /etc/swift/swift.conf +fi + +if [[ -f "/opt/kolla/swift/object.ring.gz" ]]; then + cp /opt/kolla/swift/object.ring.gz /etc/swift/object.ring.gz + chown ${OWNER}: /etc/swift/object.ring.gz + chmod 0640 /etc/swift/object.ring.gz +fi + +if [[ -f "/opt/kolla/swift/container.ring.gz" ]]; then + cp /opt/kolla/swift/container.ring.gz /etc/swift/container.ring.gz + chown ${OWNER}: /etc/swift/container.ring.gz + chmod 0640 /etc/swift/container.ring.gz fi -if [[ -f "$SOURCE_OBJECT_SERVER" ]]; then - cp $SOURCE_OBJECT_SERVER $TARGET_OBJECT_SERVER - chown ${OWNER}: $TARGET_OBJECT_SERVER - chmod 0640 $TARGET_OBJECT_SERVER +if [[ -f "/opt/kolla/swift-object-replicator/object-replicator.conf" ]]; then + cp /opt/kolla/swift-object-replicator/object-replicator.conf /etc/swift/object-replicator.conf + chown ${OWNER}: /etc/swift/object-replicator.conf + chmod 0640 /etc/swift/object-replicator.conf fi diff --git a/docker/swift/swift-object-replicator/start.sh b/docker/swift/swift-object-replicator/start.sh index 203f8864d..dbb142499 100755 --- a/docker/swift/swift-object-replicator/start.sh +++ b/docker/swift/swift-object-replicator/start.sh @@ -3,13 +3,11 @@ set -o errexit CMD="/usr/bin/swift-object-replicator" -ARGS="/etc/swift/object-server.conf --verbose" +ARGS="/etc/swift/object-replicator.conf --verbose" # Loading common functions. source /opt/kolla/kolla-common.sh -source /opt/kolla/config-swift.sh - # Execute config strategy set_configs |
