pillar, manager, storagedriver, vmdriver, readme: rework deployment modes

README.md

-# CIRCLE Project - Salt Installer
+# CIRCLE Project - Salt Installer for multiple nodes
 
 ## OS Support
 
@@ -37,28 +37,6 @@ sudo apt-get install python-pip git
 sudo pip install salt==2014.7.1
 ```
 
-
-## Configure salt
-Open the salt minion configuration
-
-```bash
-sudo mkdir -p /etc/salt
-sudo vim /etc/salt/minion
-```
-
-Add these lines:
-
-```bash
-file_client: local
-
-file_roots:
-  base:
-    - /home/cloud/salt/salt
-
-pillar_roots:
-  base:
-    - /home/cloud/salt/pillar
-```
 ## Get the installer
 Clone circle installer git repository into cloud home
 
@@ -77,7 +55,7 @@ Most used variables
 * **proxy_secret**: This is used to provide cryptographic signing, and should be set to a unique, unpredictable value.
 * **secret_key**: This is used to provide cryptographic signing, and should be set to a unique, unpredictable value.
 * **deployment_type**: local (development) or production
-* **deployment_mode**: standalone or multinode
+* **deployment_mode**: standalone or head or node
 * **admin_user**: user name to login in as admin on the site
 * **admin_pass**: password to login in as admin on the site
 * **database**:
@@ -119,7 +97,7 @@ Other variables
     * name: django database’s name
     * user: database user
 * fwdriver:
-    * open_ports: True or False - open necessary ports for libvirt, nfs server and AMQP services
+    * open_ports: True or False - open necessary ports for libvirt, nfs server and AMQP services (only for head machine)
     * repo_revision: revision
     * user: fwdriver user name
     * vm_if: vm interface
@@ -144,9 +122,16 @@ Other variables
 ## Install Circle
 Run the following installation command:
 
+*For head machine:*
 ```bash
-sudo salt-call state.sls allinone
+sudo salt-call state.sls head --local --file-root=/home/$USER/salt/salt --pillar-root=/home/$USER/salt/pillar
 ```
+
+*For node machines:*
+```bash
+sudo salt-call state.sls node --local --file-root=/home/$USER/salt/salt --pillar-root=/home/$USER/salt/pillar
+```
+
 After this finished, you have to get "Failed: 0" message.
 If installer fails, please visit the [Troubleshooting](#troubleshooting) paragraph.
 

pillar/common.sls

@@ -5,6 +5,7 @@ secret_key: Ga4aex3Eesohngo
 timezone: Europe/Budapest
 
 deployment_type: local
+deployment_mode: standalone
 
 admin_user: admin
 admin_pass: 4j23oihreehfd

salt/head.sls

+include:
+  - allinone

salt/manager/rabbitmq.sls

@@ -31,7 +31,7 @@ virtual_host:
     - require:
       - service: rabbitmq-server
 
-{% if pillar["deployment_mode"] == "multinode" %}
+{% if pillar["deployment_mode"] == "node" %}
 open_amqp_port:
   cmd.run:
     {% if grains['os_family'] == 'RedHat' %}

salt/storagedriver/nfs-server.sls

@@ -40,7 +40,7 @@ nfs-server:
   file.managed:
     - source: salt://storagedriver/files/nfsconfig
 
-{% if pillar["deployment_mode"] == "multinode" %}
+{% if pillar["deployment_mode"] == "node" %}
 salt://storagedriver/files/openports.sh:
   cmd.script:
     - template: jinja

salt/vmdriver/libvirt.sls

@@ -102,7 +102,7 @@ apparmor:
     - group: kvm
     - mode: 755
 
-{% if pillar["deployment_mode"] == "multinode" %}
+{% if pillar["deployment_mode"] == "node" %}
 open_libvirt_ports:
   cmd.run:
     {% if grains['os_family'] == 'RedHat' %}