summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-08 23:31:20 +0000
committerGerrit Code Review <review@openstack.org>2016-07-08 23:31:20 +0000
commit1ac9ceb548948c96c16108c17ca7c88b32f703fa (patch)
tree8e5acc0a6ee9292de2a9e463c89e83891276619e
parentd8fcdb5778dfaedd9a94af9d96e03e2a4d8a4e4d (diff)
parent6b6fa693499827b6bddf5a17d0787315ab3c5011 (diff)
downloadswift-1ac9ceb548948c96c16108c17ca7c88b32f703fa.tar.gz
Merge "Add description of server options (all, main, rest) for swift-init help"
-rwxr-xr-xbin/swift-init8
1 files changed, 8 insertions, 0 deletions
diff --git a/bin/swift-init b/bin/swift-init
index b31a205c6..974d03634 100755
--- a/bin/swift-init
+++ b/bin/swift-init
@@ -26,6 +26,14 @@ USAGE = \
where:
<server> is the name of a swift service e.g. proxy-server.
The '-server' part of the name may be omitted.
+ 'all', 'main' and 'rest' are reserved words that represent a
+ group of services.
+ all: Expands to all swift daemons.
+ main: Expands to main swift daemons.
+ (proxy, container, account, object)
+ rest: Expands to all remaining background daemons (beyond
+ "main").
+ (updater, replicator, auditor, etc)
<config> is an explicit configuration filename without the
.conf extension. If <config> is specified then <server> should
refer to a directory containing the configuration file, e.g.: