From 2873ad7fd2dd1a0beebb23d5bc6726f3c3cf9eeb Mon Sep 17 00:00:00 2001
From: Mischa ter Smitten <mtersmitten@oefenweb.nl>
Date: Fri, 15 Apr 2016 14:05:45 +0200
Subject: [PATCH] Consistency changes

---
 Vagrantfile    |  8 --------
 meta/main.yml  |  1 -
 tasks/main.yml | 50 ++++++++++++++++++++++++++++++++++++++------------
 vars/main.yml  |  2 +-
 4 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 443f494a..2086048a 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -4,14 +4,6 @@
 role = File.basename(File.expand_path(File.dirname(__FILE__)))
 
 boxes = [
-  {
-    :name => "ubuntu-1004",
-    :box => "opscode-ubuntu-10.04",
-    :url => "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-10.04_chef-provisionerless.box",
-    :ip => '10.0.0.10',
-    :cpu => "50",
-    :ram => "256"
-   },
   {
     :name => "ubuntu-1204",
     :box => "opscode-ubuntu-12.04",
diff --git a/meta/main.yml b/meta/main.yml
index 1760e856..4aee67cd 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -9,7 +9,6 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
-        - lucid
         - precise
         - trusty
   galaxy_tags:
diff --git a/tasks/main.yml b/tasks/main.yml
index e97d25b2..e5680169 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -4,27 +4,39 @@
   fail:
     msg: "HAProxy version {{ haproxy_version }} is not supported"
   when: haproxy_version not in haproxy_versions_supported
-  tags: [configuration, haproxy, haproxy-check-version-support]
+  tags:
+    - configuration
+    - haproxy
+    - haproxy-check-version-support
 
 - name: add repository from PPA and install its signing key
   apt_repository:
     repo: "{{ haproxy_ppa }}"
     update_cache: true
-  tags: [configuration, haproxy, haproxy-add-repository]
+  tags:
+    - configuration
+    - haproxy
+    - haproxy-add-repository
 
 - name: install dependencies
   apt:
     name: "{{ item }}"
     state: latest
-  with_items: haproxy_dependencies
-  tags: [configuration, haproxy, haproxy-dependencies]
+  with_items: "{{ haproxy_dependencies }}"
+  tags:
+    - configuration
+    - haproxy
+    - haproxy-dependencies
 
 - name: install
   apt:
     name: "{{ item }}"
     state: latest
-  with_items: haproxy_install
-  tags: [configuration, haproxy, haproxy-install]
+  with_items: "{{ haproxy_install }}"
+  tags:
+    - configuration
+    - haproxy
+    - haproxy-install
 
 - name: create certificate files directories
   file:
@@ -33,8 +45,12 @@
     owner: "{{ item.owner | default('root') }}"
     group: "{{ item.group | default('root') }}"
     mode: 0750
-  with_items: haproxy_ssl_map
-  tags: [configuration, haproxy, haproxy-configuration, haproxy-configuration-ssl]
+  with_items: "{{ haproxy_ssl_map }}"
+  tags:
+    - configuration
+    - haproxy
+    - haproxy-configuration
+    - haproxy-configuration-ssl
 
 - name: copy certificate files
   copy:
@@ -43,9 +59,13 @@
     owner: "{{ item.owner | default('root') }}"
     group: "{{ item.group | default('root') }}"
     mode: "{{ item.mode | default('0640') }}"
-  with_items: haproxy_ssl_map
+  with_items: "{{ haproxy_ssl_map }}"
   notify: restart haproxy
-  tags: [configuration, haproxy, haproxy-configuration, haproxy-configuration-ssl]
+  tags:
+    - configuration
+    - haproxy
+    - haproxy-configuration
+    - haproxy-configuration-ssl
 
 - name: update configuration file
   template:
@@ -56,11 +76,17 @@
     mode: 0640
     validate: 'haproxy -f %s -c'
   notify: restart haproxy
-  tags: [configuration, haproxy, haproxy-configuration]
+  tags:
+    - configuration
+    - haproxy
+    - haproxy-configuration
 
 - name: start and enable service
   service:
     name: haproxy
     state: started
     enabled: true
-  tags: [configuration, haproxy, haproxy-start-enable-service]
+  tags:
+    - configuration
+    - haproxy
+    - haproxy-start-enable-service
diff --git a/vars/main.yml b/vars/main.yml
index 5a502b19..29d4350a 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -4,6 +4,6 @@ haproxy_versions_supported:
   - 1.5
   - 1.6
 
-haproxy_ppa: 'ppa:vbernat/haproxy-{{ haproxy_version }}'
+haproxy_ppa: "ppa:vbernat/haproxy-{{ haproxy_version }}"
 haproxy_dependencies:
   - haproxy