Merge lp:~wesmason/charms/trusty/conn-check/trunk-use-bool into lp:~ubuntuone-hackers/charms/trusty/conn-check/trunk

[Wes Mason]

Remove custom is_true filter and use inbuilt bool

Switch custom is_true() filter for Ansible's inbuilt bool() filter [1].

[1] http://docs.ansible.com/playbooks_filters.html#other-useful-filters

[Matt Goodall (matt-goodall)]

lgtm

review: Approve

=== removed directory 'filter_plugins'
=== removed file 'filter_plugins/is_true.py'
--- filter_plugins/is_true.py	2015-04-29 10:05:56 +0000
+++ filter_plugins/is_true.py	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-class FilterModule(object):
-
-    def filters(self):
-        return {
-            'is_true': self.is_true,
-        }
-
-    def is_true(self, s):
-        # We need this for testing ansible playbook flags, as they're passed
-        # through as strings rather than the actual bool value
-        return bool(str(s).strip().lower() == 'true')

=== modified file 'playbook.yaml'
--- playbook.yaml	2015-04-28 21:43:53 +0000
+++ playbook.yaml	2015-05-12 09:10:19 +0000
@@ -66,7 +66,7 @@
         content: "{{ relations['conn-check'][0]['config'] }}"
         dest: "{{ config_path }}"
         mode: 0600
-      when: not (path_provided | is_true) and (config_provided | is_true)
+      when: not (path_provided | bool) and (config_provided | bool)
 
     - name: Write nagios check command config.
       tags:
@@ -79,7 +79,7 @@
         owner: nagios
         group: nagios
         mode: 0644
-      when: (nagios_enabled | is_true) and (config_or_path_provided | is_true)
+      when: (nagios_enabled | bool) and (config_or_path_provided | bool)
 
     - name: Write nagios check service definition for export.
       tags:
@@ -92,7 +92,7 @@
         owner: nagios
         group: nagios
         mode: 0644
-      when: (nagios_enabled | is_true) and (config_or_path_provided | is_true)
+      when: (nagios_enabled | bool) and (config_or_path_provided | bool)
 
     # We only need user/group for the run-check action, as the Nagios user executes checks above
     - name: create group