Update doc about vault pw and config files

chhofi · Jul 31, 2015 · 69ca2ab · 69ca2ab
1 parent bb5cfac
commit 69ca2ab
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/docs/source/ansibleguide.rst b/docs/source/ansibleguide.rst
@@ -6,12 +6,15 @@ Ansible Guide
 
 Before you start, see the configuration section. There are some thing you need to setup first.
 
-First, create an inventory file for the environment. There are two categories: ``masterservers`` and ``hlrs``. The first category will deploy a RayCrafter Master Server. The second will setup everything at the cluster.
+First, create an inventory file for the environment. There are three categories: ``masterservers``, ``crafternodes`` and ``hlrs``. The first category will deploy a RayCrafter Master Server. The second will setup a note that has ssh access to the cluster and submits jobs or transfers data. The third will setup everything at the cluster.
 
 For example create a file ``hosts`` with the content::
 
   # content of hosts inventory file
   [masterservers]
+  141.62.110.219 ansible_ssh_user=useronserver
+
+  [crafternodes]
   141.62.110.220 ansible_ssh_user=useronserver
   
   [hlrs]
@@ -24,10 +27,3 @@ Run the main playbook ``sites.yml``, which includes the production and hlrs play
 If you're testing with vagrant, and the VM is already running, you can use this command::
 
   $ vagrant provision
-
-or alternatively::
-
-  $ ansible-playbook -i vagrant_ansible_inventory_default --private-key=~/.vagrant.d/insecure_private_key vagrant.yml  --ask-vault-pass
-
-
-
diff --git a/docs/source/configuration.rst b/docs/source/configuration.rst
@@ -14,7 +14,7 @@ In the ansible inventory file you can configure which machines to provision. See
 Playbook
 --------
 
-The next big step is your playbook. Here you can configure which roles to use on your hosts and what variables to use. Have a look at ``production.yml`` or ``vagrant.yml``.
+The next big step is your playbook. Here you can configure which roles to use on your hosts and what variables to use. Have a look at ``site.yml``.
 
 ---------
 Variables

diff --git a/docs/source/quickstart.rst b/docs/source/quickstart.rst
@@ -24,7 +24,7 @@ Install all ansible requirements. You might have to specify a path for the roles
 Configuration
 +++++++++++++
 
-There are two sets of configurations: ``env_vars/vagrant.yml`` and ``env_vars/production.yml``.
+The main configuration files are in ``env_vars/``.
 Here you configure your setup, like the location of your Git_ project, the project name, and application name which will be used throughout the Ansible_ configuration.
 For more information see :ref:`configuration`.
 
@@ -52,7 +52,7 @@ After installing Ansible_, Vagrant_ and VirtualBox_ you simply execute::
           the encrypted shh and ssl keys. If you do not have these passwords, create your
           own keys. See the configuration section.
 
-You have to enter the ansible vault password, once provisioning starts!
+You have to create a ``vaultpwfile.txt`` with the vault password in it.
 Wait a few minutes for the magic to happen. Access the Django_ site by goingto this URL: https://192.168.33.15
 
 Access the Graylog_ web-interface via: https://192.168.33.15:9000