Updated swift-ring-builder add command to new syntax

As per bug, the swift-ring-builder add command has updated syntax which
is simpler than the old syntax. This patch updated instances of this command
in the install guide to the new, simpler syntax.

Change-Id: I6892589e4209dab5ef34abae57f7e45b83939dc0
Closes-Bug: #1161928
This commit is contained in:
Lana Brindley 2015-06-17 14:23:27 +10:00
parent 71210711df
commit cda747a94d

View File

@ -37,8 +37,9 @@
</step>
<step>
<para>Add each storage node to the ring:</para>
<screen><prompt>#</prompt> <userinput>swift-ring-builder account.builder \
add r1z1-<replaceable>STORAGE_NODE_MANAGEMENT_INTERFACE_IP_ADDRESS</replaceable>:6002/<replaceable>DEVICE_NAME</replaceable> <replaceable>DEVICE_WEIGHT</replaceable></userinput></screen>
<screen><prompt>#</prompt> <userinput>swift-ring-builder account.builder \
add --region 1 --zone 1 --ip <replaceable>STORAGE_NODE_MANAGEMENT_INTERFACE_IP_ADDRESS</replaceable> --port 6002 \
--device <replaceable>DEVICE_NAME</replaceable> --weight <replaceable>DEVICE_WEIGHT</replaceable></userinput></screen>
<para>Replace
<replaceable>STORAGE_NODE_MANAGEMENT_INTERFACE_IP_ADDRESS</replaceable>
with the IP address of the management network on the storage node.
@ -47,16 +48,21 @@
storage node in
<xref linkend="swift-install-storage-node"/> with the
<literal>/dev/sdb1</literal> storage device and weight of 100:</para>
<screen><prompt>#</prompt> <userinput>swift-ring-builder account.builder add r1z1-10.0.0.51:6002/sdb1 100</userinput></screen>
<screen><prompt>#</prompt> <userinput>swift-ring-builder account.builder add \
--region 1 --zone 1 --ip 10.0.0.51 --port 6002 --device sdb1 --weight 100</userinput></screen>
<para>Repeat this command for each storage device on each storage
node. In the example architecture, use the command in four variations:</para>
<screen><prompt>#</prompt> <userinput>swift-ring-builder account.builder add r1z1-10.0.0.51:6002/sdb1 100</userinput>
<screen><prompt>#</prompt> <userinput>swift-ring-builder account.builder add \
--region 1 --zone 1 --ip 10.0.0.51 --port 6002 --device sdb1 --weight 100</userinput>
<computeroutput>Device d0r1z1-10.0.0.51:6002R10.0.0.51:6002/sdb1_"" with 100.0 weight got id 0</computeroutput>
<prompt>#</prompt> <userinput>swift-ring-builder account.builder add r1z2-10.0.0.51:6002/sdc1 100</userinput>
<prompt>#</prompt> <userinput>swift-ring-builder account.builder add \
--region 1 --zone 2 --ip 10.0.0.51 --port 6002 --device sdc1 --weight 100</userinput>
<computeroutput>Device d1r1z2-10.0.0.51:6002R10.0.0.51:6002/sdc1_"" with 100.0 weight got id 1</computeroutput>
<prompt>#</prompt> <userinput>swift-ring-builder account.builder add r1z3-10.0.0.52:6002/sdb1 100</userinput>
<prompt>#</prompt> <userinput>swift-ring-builder account.builder add \
--region 1 --zone 3 --ip 10.0.0.52 --port 6002 --device sdb1 --weight 100</userinput>
<computeroutput>Device d2r1z3-10.0.0.52:6002R10.0.0.52:6002/sdb1_"" with 100.0 weight got id 2</computeroutput>
<prompt>#</prompt> <userinput>swift-ring-builder account.builder add r1z4-10.0.0.52:6002/sdc1 100</userinput>
<prompt>#</prompt> <userinput>swift-ring-builder account.builder add \
--region 1 --zone 4 --ip 10.0.0.52 --port 6002 --device sdc1 --weight 100</userinput>
<computeroutput>Device d3r1z4-10.0.0.52:6002R10.0.0.52:6002/sdc1_"" with 100.0 weight got id 3</computeroutput></screen>
</step>
<step>
@ -101,8 +107,9 @@ Devices: id region zone ip address port replication ip replication
</step>
<step>
<para>Add each storage node to the ring:</para>
<screen><prompt>#</prompt> <userinput>swift-ring-builder container.builder \
add r1z1-<replaceable>STORAGE_NODE_MANAGEMENT_INTERFACE_IP_ADDRESS</replaceable>:6001/<replaceable>DEVICE_NAME</replaceable> <replaceable>DEVICE_WEIGHT</replaceable></userinput></screen>
<screen><prompt>#</prompt> <userinput>swift-ring-builder container.builder \
add --region 1 --zone 1 --ip <replaceable>STORAGE_NODE_MANAGEMENT_INTERFACE_IP_ADDRESS</replaceable> --port 6001 \
--device <replaceable>DEVICE_NAME</replaceable> --weight <replaceable>DEVICE_WEIGHT</replaceable></userinput></screen>
<para>Replace
<replaceable>STORAGE_NODE_MANAGEMENT_INTERFACE_IP_ADDRESS</replaceable>
with the IP address of the management network on the storage node.
@ -111,16 +118,21 @@ Devices: id region zone ip address port replication ip replication
storage node in
<xref linkend="swift-install-storage-node"/> with the
<literal>/dev/sdb1</literal> storage device and weight of 100:</para>
<screen><prompt>#</prompt> <userinput>swift-ring-builder container.builder add r1z1-10.0.0.51:6001/sdb1 100</userinput></screen>
<screen><prompt>#</prompt> <userinput>swift-ring-builder container.builder add \
--region 1 --zone 1 --ip 10.0.0.51 --port 6001 --device sdb1 --weight 100</userinput></screen>
<para>Repeat this command for each storage device on each storage
node. In the example architecture, use the command in four variations:</para>
<screen><prompt>#</prompt> <userinput>swift-ring-builder container.builder add r1z1-10.0.0.51:6001/sdb1 100</userinput>
<screen><prompt>#</prompt> <userinput>swift-ring-builder container.builder add \
--region 1 --zone 1 --ip 10.0.0.51 --port 6001 --device sdb1 --weight 100</userinput>
<computeroutput>Device d0r1z1-10.0.0.51:6001R10.0.0.51:6001/sdb1_"" with 100.0 weight got id 0</computeroutput>
<prompt>#</prompt> <userinput>swift-ring-builder container.builder add r1z2-10.0.0.51:6001/sdc1 100</userinput>
<prompt>#</prompt> <userinput>swift-ring-builder container.builder add \
--region 1 --zone 2 --ip 10.0.0.51 --port 6001 --device sdc1 --weight 100</userinput>
<computeroutput>Device d1r1z2-10.0.0.51:6001R10.0.0.51:6001/sdc1_"" with 100.0 weight got id 1</computeroutput>
<prompt>#</prompt> <userinput>swift-ring-builder container.builder add r1z3-10.0.0.52:6001/sdb1 100</userinput>
<prompt>#</prompt> <userinput>swift-ring-builder container.builder add \
--region 1 --zone 3 --ip 10.0.0.52 --port 6001 --device sdb1 --weight 100</userinput>
<computeroutput>Device d2r1z3-10.0.0.52:6001R10.0.0.52:6001/sdb1_"" with 100.0 weight got id 2</computeroutput>
<prompt>#</prompt> <userinput>swift-ring-builder container.builder add r1z4-10.0.0.52:6001/sdc1 100</userinput>
<prompt>#</prompt> <userinput>swift-ring-builder container.builder add \
--region 1 --zone 4 --ip 10.0.0.52 --port 6001 --device sdc1 --weight 100</userinput>
<computeroutput>Device d3r1z4-10.0.0.52:6001R10.0.0.52:6001/sdc1_"" with 100.0 weight got id 3</computeroutput></screen>
</step>
<step>
@ -164,8 +176,9 @@ Devices: id region zone ip address port replication ip replication
</step>
<step>
<para>Add each storage node to the ring:</para>
<screen><prompt>#</prompt> <userinput>swift-ring-builder object.builder \
add r1z1-<replaceable>STORAGE_NODE_MANAGEMENT_INTERFACE_IP_ADDRESS</replaceable>:6000/<replaceable>DEVICE_NAME</replaceable> <replaceable>DEVICE_WEIGHT</replaceable></userinput></screen>
<screen><prompt>#</prompt> <userinput>swift-ring-builder object.builder \
add --region 1 --zone 1 --ip <replaceable>STORAGE_NODE_MANAGEMENT_INTERFACE_IP_ADDRESS</replaceable> --port 6000 /
--device <replaceable>DEVICE_NAME</replaceable> --weight <replaceable>DEVICE_WEIGHT</replaceable></userinput></screen>
<para>Replace
<replaceable>STORAGE_NODE_MANAGEMENT_INTERFACE_IP_ADDRESS</replaceable>
with the IP address of the management network on the storage node.
@ -177,13 +190,17 @@ Devices: id region zone ip address port replication ip replication
<screen><prompt>#</prompt> <userinput>swift-ring-builder object.builder add r1z1-10.0.0.51:6000/sdb1 100</userinput></screen>
<para>Repeat this command for each storage device on each storage
node. In the example architecture, use the command in four variations:</para>
<screen><prompt>#</prompt> <userinput>swift-ring-builder object.builder add r1z1-10.0.0.51:6000/sdb1 100</userinput>
<screen><prompt>#</prompt> <userinput>swift-ring-builder object.builder add \
--region 1 --zone 1 --ip 10.0.0.51 --port 6000 --device sdb1 --weight 100</userinput>
<computeroutput>Device d0r1z1-10.0.0.51:6000R10.0.0.51:6000/sdb1_"" with 100.0 weight got id 0</computeroutput>
<prompt>#</prompt> <userinput>swift-ring-builder object.builder add r1z2-10.0.0.51:6000/sdc1 100</userinput>
<prompt>#</prompt> <userinput>swift-ring-builder object.builder add \
--region 1 --zone 2 --ip 10.0.0.51 --port 6000 --device sdc1 --weight 100</userinput>
<computeroutput>Device d1r1z2-10.0.0.51:6000R10.0.0.51:6000/sdc1_"" with 100.0 weight got id 1</computeroutput>
<prompt>#</prompt> <userinput>swift-ring-builder object.builder add r1z3-10.0.0.52:6000/sdb1 100</userinput>
<prompt>#</prompt> <userinput>swift-ring-builder object.builder add \
--region 1 --zone 3 --ip 10.0.0.52 --port 6000 --device sdb1 --weight 100</userinput>
<computeroutput>Device d2r1z3-10.0.0.52:6000R10.0.0.52:6000/sdb1_"" with 100.0 weight got id 2</computeroutput>
<prompt>#</prompt> <userinput>swift-ring-builder object.builder add r1z4-10.0.0.52:6000/sdc1 100</userinput>
<prompt>#</prompt> <userinput>swift-ring-builder object.builder add \
--region 1 --zone 4 --ip 10.0.0.52 --port 6000 --device sdc1 --weight 100</userinput>
<computeroutput>Device d3r1z4-10.0.0.52:6000R10.0.0.52:6000/sdc1_"" with 100.0 weight got id 3</computeroutput></screen>
</step>
<step>