aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQiu Yu <qiuyu@ebaysf.com>2015-09-17 17:56:11 -0700
committerQiu Yu <qiuyu@ebaysf.com>2015-09-18 09:00:09 +0800
commite4b825e084770c3fc8693d7fbce07d3141abb78b (patch)
tree8884768aea8af346c7f71a48fd24cb899ae730f7
parent1b33345fb8b16269d80e9379ad217049946c04e4 (diff)
downloadkolla-e4b825e084770c3fc8693d7fbce07d3141abb78b.tar.gz
kolla-e4b825e084770c3fc8693d7fbce07d3141abb78b.zip
Fix ring bulder command examples in swift readme doc
- avoid hard coding install type and base distro in sample commands - fix semicolon to actually make for loop work Change-Id: I15b46fec5b4ebf7987ea22e7c71a44c739f7dee3
-rw-r--r--doc/swift-readme.rst24
1 files changed, 13 insertions, 11 deletions
diff --git a/doc/swift-readme.rst b/doc/swift-readme.rst
index 9f8e19ecd..6f138d867 100644
--- a/doc/swift-readme.rst
+++ b/doc/swift-readme.rst
@@ -33,51 +33,53 @@ container directories:
::
export KOLLA_INTERNAL_ADDRESS=1.2.3.4
+ export KOLLA_BASE_DISTRO=centos
+ export KOLLA_INSTALL_TYPE=binary
# Object ring
docker run \
-v /etc/kolla/config/swift/:/etc/kolla/config/swift/ \
- kollaglue/centos-binary-swift-base \
+ kollaglue/${KOLLA_BASE_DISTRO}-${KOLLA_INSTALL_TYPE}-swift-base \
swift-ring-builder /etc/kolla/config/swift/object.builder create 10 3 1
for partition in sdb1 sdb2 sdb3; do
docker run \
-v /etc/kolla/config/swift/:/etc/kolla/config/swift/ \
- kollaglue/centos-binary-swift-base swift-ring-builder \
- /etc/kolla/config/swift/object.builder add z1-${KOLLA_INTERNAL_ADDRESS}:6000/${partition} 1
+ kollaglue/${KOLLA_BASE_DISTRO}-${KOLLA_INSTALL_TYPE}-swift-base swift-ring-builder \
+ /etc/kolla/config/swift/object.builder add z1-${KOLLA_INTERNAL_ADDRESS}:6000/${partition} 1;
done
# Account ring
docker run \
-v /etc/kolla/config/swift/:/etc/kolla/config/swift/ \
- kollaglue/centos-binary-swift-base \
+ kollaglue/${KOLLA_BASE_DISTRO}-${KOLLA_INSTALL_TYPE}-swift-base \
swift-ring-builder /etc/kolla/config/swift/account.builder create 10 3 1
for partition in sdb1 sdb2 sdb3; do
docker run \
-v /etc/kolla/config/swift/:/etc/kolla/config/swift/ \
- kollaglue/centos-binary-swift-base swift-ring-builder \
- /etc/kolla/config/swift/account.builder add z1-${KOLLA_INTERNAL_ADDRESS}:6001/${partition} 1
+ kollaglue/${KOLLA_BASE_DISTRO}-${KOLLA_INSTALL_TYPE}-swift-base swift-ring-builder \
+ /etc/kolla/config/swift/account.builder add z1-${KOLLA_INTERNAL_ADDRESS}:6001/${partition} 1;
done
# Container ring
docker run \
-v /etc/kolla/config/swift/:/etc/kolla/config/swift/ \
- kollaglue/centos-binary-swift-base \
+ kollaglue/${KOLLA_BASE_DISTRO}-${KOLLA_INSTALL_TYPE}-swift-base \
swift-ring-builder /etc/kolla/config/swift/container.builder create 10 3 1
for partition in sdb1 sdb2 sdb3; do
docker run \
-v /etc/kolla/config/swift/:/etc/kolla/config/swift/ \
- kollaglue/centos-binary-swift-base swift-ring-builder \
- /etc/kolla/config/swift/container.builder add z1-${KOLLA_INTERNAL_ADDRESS}:6002/${partition} 1
+ kollaglue/${KOLLA_BASE_DISTRO}-${KOLLA_INSTALL_TYPE}-swift-base swift-ring-builder \
+ /etc/kolla/config/swift/container.builder add z1-${KOLLA_INTERNAL_ADDRESS}:6002/${partition} 1;
done
for ring in object account container; do
docker run \
-v /etc/kolla/config/swift/:/etc/kolla/config/swift/ \
- kollaglue/centos-binary-swift-base swift-ring-builder \
- /etc/kolla/config/swift/${ring}.builder rebalance
+ kollaglue/${KOLLA_BASE_DISTRO}-${KOLLA_INSTALL_TYPE}-swift-base swift-ring-builder \
+ /etc/kolla/config/swift/${ring}.builder rebalance;
done
Similar commands can be used for multinode, you will just need to run the the 'add' step for each IP