Improve Swift ring setup sample script

The sample script provided in the docs to configure rings should add
each storage node the ring, not the control node pointed to by the vip.

Change-Id: I28ad60eb3c07f5da0e04e7780c41a7eed158b6d5
This commit is contained in:
Paul Bourke 2017-07-11 11:44:11 +01:00
parent 4510c525a6
commit bf95283927

View File

@ -73,8 +73,8 @@ different.
:: ::
export KOLLA_INTERNAL_ADDRESS=1.2.3.4 STORAGE_NODES=(192.168.0.2 192.168.0.3 192.168.0.4)
export KOLLA_SWIFT_BASE_IMAGE="kolla/oraclelinux-source-swift-base:4.0.0" KOLLA_SWIFT_BASE_IMAGE="kolla/oraclelinux-source-swift-base:4.0.0"
mkdir -p /etc/kolla/config/swift mkdir -p /etc/kolla/config/swift
@ -86,13 +86,15 @@ different.
swift-ring-builder \ swift-ring-builder \
/etc/kolla/config/swift/object.builder create 10 3 1 /etc/kolla/config/swift/object.builder create 10 3 1
for i in {0..2}; do for node in ${STORAGE_NODES[@]}; do
docker run \ for i in {0..2}; do
--rm \ docker run \
-v /etc/kolla/config/swift/:/etc/kolla/config/swift/ \ --rm \
$KOLLA_SWIFT_BASE_IMAGE \ -v /etc/kolla/config/swift/:/etc/kolla/config/swift/ \
swift-ring-builder \ $KOLLA_SWIFT_BASE_IMAGE \
/etc/kolla/config/swift/object.builder add r1z1-${KOLLA_INTERNAL_ADDRESS}:6000/d${i} 1; swift-ring-builder \
/etc/kolla/config/swift/object.builder add r1z1-${node}:6000/d${i} 1;
done
done done
# Account ring # Account ring
@ -103,13 +105,15 @@ different.
swift-ring-builder \ swift-ring-builder \
/etc/kolla/config/swift/account.builder create 10 3 1 /etc/kolla/config/swift/account.builder create 10 3 1
for i in {0..2}; do for node in ${STORAGE_NODES[@]}; do
docker run \ for i in {0..2}; do
--rm \ docker run \
-v /etc/kolla/config/swift/:/etc/kolla/config/swift/ \ --rm \
$KOLLA_SWIFT_BASE_IMAGE \ -v /etc/kolla/config/swift/:/etc/kolla/config/swift/ \
swift-ring-builder \ $KOLLA_SWIFT_BASE_IMAGE \
/etc/kolla/config/swift/account.builder add r1z1-${KOLLA_INTERNAL_ADDRESS}:6001/d${i} 1; swift-ring-builder \
/etc/kolla/config/swift/account.builder add r1z1-${node}:6001/d${i} 1;
done
done done
# Container ring # Container ring
@ -120,13 +124,15 @@ different.
swift-ring-builder \ swift-ring-builder \
/etc/kolla/config/swift/container.builder create 10 3 1 /etc/kolla/config/swift/container.builder create 10 3 1
for i in {0..2}; do for node in ${STORAGE_NODES[@]}; do
docker run \ for i in {0..2}; do
--rm \ docker run \
-v /etc/kolla/config/swift/:/etc/kolla/config/swift/ \ --rm \
$KOLLA_SWIFT_BASE_IMAGE \ -v /etc/kolla/config/swift/:/etc/kolla/config/swift/ \
swift-ring-builder \ $KOLLA_SWIFT_BASE_IMAGE \
/etc/kolla/config/swift/container.builder add r1z1-${KOLLA_INTERNAL_ADDRESS}:6002/d${i} 1; swift-ring-builder \
/etc/kolla/config/swift/container.builder add r1z1-${node}:6002/d${i} 1;
done
done done
for ring in object account container; do for ring in object account container; do