From 057d2f2ea5ea80692f2f61dff80217da9003d791 Mon Sep 17 00:00:00 2001
From: Robin Schneider <ypid@riseup.net>
Date: Fri, 8 Jan 2016 10:40:21 +0100
Subject: [PATCH] Improved coding style as it is used in the DebOps project.

* Use YAML syntax which is better human readable.
* Try to use Ansible modules for operations when this is possible.
* `template/dumpenv/dumpenv.j2` seems to be missing.
---
 examples/ansible/qubes-service.yml            | 21 ++++++++++++-------
 examples/ansible/tasks/dumpenv.yml            | 17 ++++++++++++---
 .../systemd/system}/qubes-service.service.j2  |  0
 examples/ansible/test-facts.yml               |  5 ++++-
 examples/ansible/test-nofacts.yml             |  3 ++-
 5 files changed, 34 insertions(+), 12 deletions(-)
 rename examples/ansible/{files/qubes-service => templates/etc/systemd/system}/qubes-service.service.j2 (100%)

diff --git a/examples/ansible/qubes-service.yml b/examples/ansible/qubes-service.yml
index 3cef88c..6e55f89 100644
--- a/examples/ansible/qubes-service.yml
+++ b/examples/ansible/qubes-service.yml
@@ -1,13 +1,20 @@
+---
+
 - hosts: templatevms
   sudo: True
   vars:
-    description: Qubes hello world
-    name: helloworld
+    description: 'Qubes hello world'
+    name: 'helloworld'
+
   tasks:
-  - name: deploy service file
+
+  - name: Deploy service file
     template:
-      src: files/qubes-service/qubes-service.service.j2
-      dest: /etc/systemd/system/qubes-{{ name }}.service
+      src: 'etc/qubes-service/qubes-service.service.j2'
+      dest: '/etc/systemd/system/qubes-{{ name }}.service'
     register: unitfile
-  - name: enable service file
-    service: name=qubes-{{ name }}.service enabled=true
+
+  - name: Enable service file
+    service:
+      name: 'qubes-{{ name }}.service'
+      enabled: True
diff --git a/examples/ansible/tasks/dumpenv.yml b/examples/ansible/tasks/dumpenv.yml
index cb243e6..7901506 100644
--- a/examples/ansible/tasks/dumpenv.yml
+++ b/examples/ansible/tasks/dumpenv.yml
@@ -1,8 +1,19 @@
 ---
 
 - name: Remove previous directory
-  local_action: file dest=/tmp/dump state=absent
+  file:
+    path: '/tmp/dump'
+    state: 'absent'
+  delegate_to: 'localhost'
+
 - name: Create directory
-  local_action: shell mkdir -p /tmp/dump || true
+  file:
+    path: '/tmp/dump'
+    state: 'directory'
+  delegate_to: 'localhost'
+
 - name: Dump all vars
-  local_action: template src=files/dumpenv/dumpenv.j2 dest=/tmp/dump/{{ inventory_hostname }}
+  template:
+    src: 'template/dumpenv/dumpenv.j2'
+    dest: '/tmp/dump/{{ inventory_hostname }}'
+  delegate_to: 'localhost'
diff --git a/examples/ansible/files/qubes-service/qubes-service.service.j2 b/examples/ansible/templates/etc/systemd/system/qubes-service.service.j2
similarity index 100%
rename from examples/ansible/files/qubes-service/qubes-service.service.j2
rename to examples/ansible/templates/etc/systemd/system/qubes-service.service.j2
diff --git a/examples/ansible/test-facts.yml b/examples/ansible/test-facts.yml
index 6be8ad6..16489c7 100644
--- a/examples/ansible/test-facts.yml
+++ b/examples/ansible/test-facts.yml
@@ -1,6 +1,9 @@
 ---
+
 - hosts: all:!nonqubes
   tasks:
+
   - name: cat the contents of file /etc/passwd
     shell: head /etc/passwd
-  - include: tasks/dumpenv.yml
+
+  - include: 'tasks/dumpenv.yml'
diff --git a/examples/ansible/test-nofacts.yml b/examples/ansible/test-nofacts.yml
index 6b0a9a2..ed2cd2a 100644
--- a/examples/ansible/test-nofacts.yml
+++ b/examples/ansible/test-nofacts.yml
@@ -1,5 +1,6 @@
 ---
+
 - hosts: all:!nonqubes
   gather_facts: False
   tasks:
-  - include: tasks/dumpenv.yml
+  - include: 'tasks/dumpenv.yml'