From 6a54cb529ca689103c9081c26ce9bf662a8ec9ac Mon Sep 17 00:00:00 2001 From: Anne Gentle Date: Mon, 16 May 2011 22:59:57 -0500 Subject: [PATCH 1/3] Edits to multinode install after testing in internal training class --- doc/source/development_saio.rst | 15 ++++++----- doc/source/howto_installmultinode.rst | 38 ++++++++++++++------------- 2 files changed, 28 insertions(+), 25 deletions(-) diff --git a/doc/source/development_saio.rst b/doc/source/development_saio.rst index ce2a09e270..de536b2c76 100644 --- a/doc/source/development_saio.rst +++ b/doc/source/development_saio.rst @@ -229,19 +229,20 @@ Getting the code and setting up test environment Sample configuration files are provided with all defaults in line-by-line comments. -Do these commands as you on guest: +Do these commands as you on guest. The bazaar configuration is optional; you can always do a bzr branch command regardless of whether you have a Launchpad account: - #. `mkdir ~/bin` - #. Create `~/.bazaar/bazaar.conf`:: + #. (optional) `mkdir ~/bin/.bazaar` + #. (optional) Create `~/.bazaar/bazaar.conf`:: [DEFAULT] email = Your Name - #. If you are using launchpad to get the code or make changes, run + #. (optional) If you are using launchpad to get the code or make changes, run `bzr launchpad-login ` - #. Create the swift repo with `bzr init-repo swift` - #. Check out your bzr branch of swift, for example: + #. (optional) Create the swift repo with `bzr init-repo swift` + #. Check out a bzr branch of swift, for example: `cd ~/swift; bzr branch lp:swift trunk` - #. `cd ~/swift/trunk; sudo python setup.py develop` + #. Build a development installation of swift, for example: + `cd ~/swift/trunk; sudo python setup.py develop` #. Edit `~/.bashrc` and add to the end:: export SWIFT_TEST_CONFIG_FILE=/etc/swift/func_test.conf diff --git a/doc/source/howto_installmultinode.rst b/doc/source/howto_installmultinode.rst index ddc1ddd044..240005bc88 100644 --- a/doc/source/howto_installmultinode.rst +++ b/doc/source/howto_installmultinode.rst @@ -147,7 +147,7 @@ Configure the Proxy node [filter:cache] use = egg:swift#memcache - memcache_servers = :11211 + memcache_servers = $PROXY_LOCAL_NET_IP:11211 EOF .. note:: @@ -156,7 +156,9 @@ Configure the Proxy node in the [filter:cache] section of the proxy-server.conf file like: `10.1.2.3:11211,10.1.2.4:11211`. Only the proxy server uses memcache. -#. Create the account, container and object rings:: +#. Create the account, container and object rings. The builder command is basically creating a builder file with a few parameters. The parameter with the value of 18 represents 2 ^ 18th, the value that the partition will be sized to. Set this "partition power" value based on the total amount of storage you expect your entire ring to use. The value of 3 represents the number of replicas of each object, with the last value being the number of hours to restrict moving a partition more than once. + +:: cd /etc/swift swift-ring-builder account.builder create 18 3 1 @@ -297,7 +299,7 @@ Configure the Storage nodes cat >/etc/swift/container-server.conf < + bind_ip = $STORAGE_LOCAL_NET_IP workers = 2 [pipeline:main] @@ -317,7 +319,7 @@ Configure the Storage nodes cat >/etc/swift/object-server.conf < + bind_ip = $STORAGE_LOCAL_NET_IP workers = 2 [pipeline:main] @@ -371,12 +373,12 @@ You run these commands from the Proxy node. above. *Note: None of the values of account, username, or password are special - they can be anything.*:: - swauth-prep -A https://:8080/auth/ -K swauthkey - swauth-add-user -A https://:8080/auth/ -K swauthkey -a system root testpass + swauth-prep -A https://$PROXY_LOCAL_NET_IP:8080/auth/ -K swauthkey + swauth-add-user -A https://$PROXY_LOCAL_NET_IP:8080/auth/ -K swauthkey -a system root testpass #. Get an X-Storage-Url and X-Auth-Token:: - curl -k -v -H 'X-Storage-User: system:root' -H 'X-Storage-Pass: testpass' https://:8080/auth/v1.0 + curl -k -v -H 'X-Storage-User: system:root' -H 'X-Storage-Pass: testpass' https://$PROXY_LOCAL_NET_IP:8080/auth/v1.0 #. Check that you can HEAD the account:: @@ -384,32 +386,32 @@ You run these commands from the Proxy node. #. Check that ``st`` works (at this point, expect zero containers, zero objects, and zero bytes):: - st -A https://:8080/auth/v1.0 -U system:root -K testpass stat + st -A https://$PROXY_LOCAL_NET_IP:8080/auth/v1.0 -U system:root -K testpass stat #. Use ``st`` to upload a few files named 'bigfile[1-2].tgz' to a container named 'myfiles':: - st -A https://:8080/auth/v1.0 -U system:root -K testpass upload myfiles bigfile1.tgz - st -A https://:8080/auth/v1.0 -U system:root -K testpass upload myfiles bigfile2.tgz + st -A https://$PROXY_LOCAL_NET_IP:8080/auth/v1.0 -U system:root -K testpass upload myfiles bigfile1.tgz + st -A https://$PROXY_LOCAL_NET_IP:8080/auth/v1.0 -U system:root -K testpass upload myfiles bigfile2.tgz #. Use ``st`` to download all files from the 'myfiles' container:: - st -A https://:8080/auth/v1.0 -U system:root -K testpass download myfiles + st -A https://$PROXY_LOCAL_NET_IP:8080/auth/v1.0 -U system:root -K testpass download myfiles #. Use ``st`` to save a backup of your builder files to a container named 'builders'. Very important not to lose your builders!:: - st -A https://:8080/auth/v1.0 -U system:root -K testpass upload builders /etc/swift/*.builder + st -A https://$PROXY_LOCAL_NET_IP:8080/auth/v1.0 -U system:root -K testpass upload builders /etc/swift/*.builder #. Use ``st`` to list your containers:: - st -A https://:8080/auth/v1.0 -U system:root -K testpass list + st -A https://$PROXY_LOCAL_NET_IP:8080/auth/v1.0 -U system:root -K testpass list #. Use ``st`` to list the contents of your 'builders' container:: - st -A https://:8080/auth/v1.0 -U system:root -K testpass list builders + st -A https://$PROXY_LOCAL_NET_IP:8080/auth/v1.0 -U system:root -K testpass list builders #. Use ``st`` to download all files from the 'builders' container:: - st -A https://:8080/auth/v1.0 -U system:root -K testpass download builders + st -A https://$PROXY_LOCAL_NET_IP:8080/auth/v1.0 -U system:root -K testpass download builders .. _add-proxy-server: @@ -426,7 +428,7 @@ See :ref:`config-proxy` for the initial setup, and then follow these additional [filter:cache] use = egg:swift#memcache - memcache_servers = :11211 + memcache_servers = $PROXY_LOCAL_NET_IP:11211 #. Change the default_cluster_url to point to the load balanced url, rather than the first proxy server you created in /etc/swift/proxy-server.conf:: @@ -440,11 +442,11 @@ See :ref:`config-proxy` for the initial setup, and then follow these additional First retreve what the URL was:: - swauth-list -A https://:8080/auth/ -K swauthkey + swauth-list -A https://$PROXY_LOCAL_NET_IP:8080/auth/ -K swauthkey And then update it with:: - swauth-set-account-service -A https://:8080/auth/ -K swauthkey storage local + swauth-set-account-service -A https://$PROXY_LOCAL_NET_IP:8080/auth/ -K swauthkey storage local Make the look just like it's original URL but with the host:port update you want. From 5804669c254a7039916f89e19939637a4f7bccc2 Mon Sep 17 00:00:00 2001 From: Anne Gentle Date: Tue, 17 May 2011 22:50:44 -0500 Subject: [PATCH 2/3] Changing optional bzr steps to be more precise --- doc/source/development_saio.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/source/development_saio.rst b/doc/source/development_saio.rst index de536b2c76..a8978e097e 100644 --- a/doc/source/development_saio.rst +++ b/doc/source/development_saio.rst @@ -231,7 +231,8 @@ Sample configuration files are provided with all defaults in line-by-line commen Do these commands as you on guest. The bazaar configuration is optional; you can always do a bzr branch command regardless of whether you have a Launchpad account: - #. (optional) `mkdir ~/bin/.bazaar` + #. `mkdir ~/bin` + #. (optional) `mkdir ~/.bazaar` #. (optional) Create `~/.bazaar/bazaar.conf`:: [DEFAULT] From 857d6e2f870ecf2a7120bf13b8481f3491c6c381 Mon Sep 17 00:00:00 2001 From: Anne Gentle Date: Wed, 18 May 2011 10:26:52 -0500 Subject: [PATCH 3/3] Made bzr init-repo swift step non-optional --- doc/source/development_saio.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/development_saio.rst b/doc/source/development_saio.rst index a8978e097e..bd9d6d80ad 100644 --- a/doc/source/development_saio.rst +++ b/doc/source/development_saio.rst @@ -239,7 +239,7 @@ Do these commands as you on guest. The bazaar configuration is optional; you can email = Your Name #. (optional) If you are using launchpad to get the code or make changes, run `bzr launchpad-login ` - #. (optional) Create the swift repo with `bzr init-repo swift` + #. Create the swift repo with `bzr init-repo swift` #. Check out a bzr branch of swift, for example: `cd ~/swift; bzr branch lp:swift trunk` #. Build a development installation of swift, for example: