From 1d5f7d21fd8b5c747d0022590accb1fe230e961a Mon Sep 17 00:00:00 2001
From: Sandy Walsh <sandy.walsh@rackspace.com>
Date: Sun, 8 Mar 2015 20:42:00 -0700
Subject: [PATCH] Better explain how ansible scripts work

And fix some wonky things in the deploy

Change-Id: I681c7be1223e81617b3e2912aa87e72cc9514d49
---
 ansible/roles/stv3-workers/defaults/main.yaml |  4 +--
 build.sh                                      |  1 +
 docs/install.html                             | 29 +++++++++++++++++++
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/stv3-workers/defaults/main.yaml b/ansible/roles/stv3-workers/defaults/main.yaml
index cd9bf2f..60d68c9 100644
--- a/ansible/roles/stv3-workers/defaults/main.yaml
+++ b/ansible/roles/stv3-workers/defaults/main.yaml
@@ -11,7 +11,7 @@ cells:
   - cell: cell-1
     rabbit_host: localhost
     rabbit_user: guest
-    rabbit_password: password
+    rabbit_password: guest
     rabbit_port: 5672
     rabbit_vhost: /
     rabbit_exchange: nova
@@ -21,7 +21,7 @@ cells:
   - cell: cell-2
     rabbit_host: localhost
     rabbit_user: guest
-    rabbit_password: password
+    rabbit_password: guest
     rabbit_port: 5672
     rabbit_vhost: /
     rabbit_exchange: nova
diff --git a/build.sh b/build.sh
index bd9ad1c..9efe26b 100755
--- a/build.sh
+++ b/build.sh
@@ -79,6 +79,7 @@ then
         set +e
         cd ..
     done
+    exit
 fi
 
 cd ..
diff --git a/docs/install.html b/docs/install.html
index 828f15d..ba4c9ed 100644
--- a/docs/install.html
+++ b/docs/install.html
@@ -108,6 +108,35 @@
           <h3>The Ansible deployment scripts</h3>
           <p>In the <a href='https://github.com/stackforge/stacktach-sandbox/tree/master/ansible'>StackTach Sandbox</a> repo, there is an ansible directory that contains roles for the workers, the API nodes and the database. There is a fourth "common" role that is used by the other roles.</p>
           <p>These scripts assume a multi-cell deployment where there is one StackTach.v3 deployment per region (each with it's own API servers and database). If you are not running with cells, pretend it's a single cell.</p>
+
+          <p>The servers are deployed in the following way:</p>
+          <pre>
+# Everything is installed and deployed as:          
+user: stv3
+group: stv3
+
+Code:
+/opt/stv3
+
+Daemons:
+/etc/init.d/
+
+Config:
+/etc/stv3
+
+Logs:
+/var/log/stv3
+
+PIDs:
+/var/run/stv3/
+
+# To launch a service manually (logging in a different user)
+sudo -s
+su stv3
+cd /opt/stv3/bin
+. ./activate
+./yagi-event --config /etc/stv3/yagi-cell-1.conf
+          </pre>
           <h3>The Build script</h3>
           <p>The <a href='https://github.com/stackforge/stacktach-sandbox'>StackTach Sandbox</a> repo is the umbrella repo for all the other StackTach modules. It:</p>
           <ul>