Merge pull request #678 from holta/4-server-options

Stages 4-9: main.yml indentation/syntax per new Ansible docs

roles/4-server-options/tasks/main.yml

@@ -78,15 +78,17 @@
   tags: usb-lib
 
 - name: Create a Python interface to iiab.env
-  template: src=roles/1-prep/templates/iiab_env.py.j2
+  template:
-            dest=/etc/iiab/iiab_env.py
+    src: roles/1-prep/templates/iiab_env.py.j2
+    dest: /etc/iiab/iiab_env.py
 
 - name: Generate the offline documents
   command: /usr/bin/iiab-refresh-wiki-docs
   when: not nodocs
 
 - name: Recording STAGE 4 HAS COMPLETED ==================
-  lineinfile: dest=/etc/iiab/iiab.env
+  lineinfile:
-              regexp='^STAGE=*'
+    dest: /etc/iiab/iiab.env
-              line='STAGE=4'
+    regexp: '^STAGE=*'
-              state=present
+    line: 'STAGE=4'
+    state: present

roles/5-xo-services/tasks/main.yml

@@ -22,7 +22,8 @@
   tags: olpc, idmgr
 
 - name: Recording STAGE 5 HAS COMPLETED =====================
-  lineinfile: dest=/etc/iiab/iiab.env
+  lineinfile:
-             regexp='^STAGE=*'
+    dest: /etc/iiab/iiab.env
-              line='STAGE=5'
+    regexp: '^STAGE=*'
-              state=present
+    line: 'STAGE=5'
+    state: present

roles/6-generic-apps/tasks/main.yml

@@ -40,7 +40,8 @@
   tags: wordpress
 
 - name: Recording STAGE 6 HAS COMPLETED ====================
-  lineinfile: dest=/etc/iiab/iiab.env
+  lineinfile:
-             regexp='^STAGE=*'
+    dest: /etc/iiab/iiab.env
-              line='STAGE=6'
+    regexp: '^STAGE=*'
-              state=present
+    line: 'STAGE=6'
+    state: present

roles/7-edu-apps/tasks/main.yml

@@ -40,7 +40,8 @@
   tags: sugarizer
 
 - name: Recording STAGE 7 HAS COMPLETED ========================
-  lineinfile: dest=/etc/iiab/iiab.env
+  lineinfile:
-             regexp='^STAGE=*'
+    dest: /etc/iiab/iiab.env
-              line='STAGE=7'
+    regexp: '^STAGE=*'
-              state=present
+    line: 'STAGE=7'
+    state: present

roles/8-mgmt-tools/tasks/main.yml

@@ -52,7 +52,8 @@
   tags: xovis
 
 - name: Recording STAGE 8 HAS COMPLETED ======================
-  lineinfile: dest=/etc/iiab/iiab.env
+  lineinfile:
-             regexp='^STAGE=*'
+    dest: /etc/iiab/iiab.env
-              line='STAGE=8'
+    regexp: '^STAGE=*'
-              state=present
+    line: 'STAGE=8'
+    state: present

roles/9-local-addons/tasks/main.yml

@@ -10,7 +10,8 @@
   tags: calibre
 
 - name: Recording STAGE 9 HAS COMPLETED ====================
-  lineinfile: dest=/etc/iiab/iiab.env
+  lineinfile:
-             regexp='^STAGE=*'
+    dest: /etc/iiab/iiab.env
-              line='STAGE=9'
+    regexp: '^STAGE=*'
-              state=present
+    line: 'STAGE=9'
+    state: present