Fix lint errors and find replace issues.

tasks/Amazon/dashboard.yml

@@ -3,7 +3,8 @@
 # Specific to CentOS
 
 - name: Include ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
   tags: dashboard
 
 - name: Ensure Uchiwa is installed

tasks/Amazon/main.yml

@@ -3,8 +3,9 @@
 # This takes care of base prerequisites for Amazon Linux AMI
 
 - name: Include ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
   tags: setup
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
 
 - name: Set epel_version override when AmazonLinux AMIv2
   tags: setup

tasks/Amazon/rabbit.yml

@@ -3,7 +3,8 @@
 # Specific to Amazon Linux
 
 - name: Include ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
   tags: rabbitmq
 
 - name: Configure RabbitMQ/RabbitMQ-erlang GPG keys in the RPM keyring

tasks/Amazon/redis.yml

@@ -3,7 +3,8 @@
 # Specific to Amazon Linux AMI
 
 - name: Include ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
   tags: redis
 
 - name: Install EPEL repo

tasks/CentOS/dashboard.yml

@@ -3,9 +3,8 @@
 # Specific to CentOS
 
 - name: Include ansible_distribution vars
-  include_varse ansible_distribution vars
-  include_varse ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
   tags: dashboard
 
 - name: Ensure Uchiwa is installed
@@ -36,7 +35,7 @@
   tags: dashboard
   template:
     src: sensu_enterprise_dashboard_config.json.j2
-    dest: "{{ sensu_config_path}}/dashboard.json"
+    dest: "{{ sensu_config_path }}/dashboard.json"
   when: se_enterprise
   notify:
     - restart sensu-enterprise-dashboard service

tasks/CentOS/main.yml

@@ -3,8 +3,8 @@
 # This takes care of base prerequisites for CentOS
 
 - name: Include ansible_distribution vars
-  include_varse ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
   tags: setup
 
 - name: Ensure the Sensu Core Yum repo is present

tasks/CentOS/rabbit.yml

@@ -3,8 +3,8 @@
 # Specific to CentOS
 
 - name: Include ansible_distribution vars
-  include_varse ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
   tags: rabbitmq
 
 - name: Configure RabbitMQ GPG keys in the RPM keyring

tasks/CentOS/redis.yml

@@ -3,8 +3,8 @@
 # Specific to CentOS
 
 - name: Include ansible_distribution vars
-  include_varse ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
   tags: redis
 
 - name: Install EPEL repo

tasks/Debian/dashboard.yml

@@ -3,7 +3,8 @@
 # Specific to Debian
 
 - name: Include ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
   tags: dashboard
 
 - name: Install uchiwa

tasks/Debian/main.yml

@@ -3,7 +3,8 @@
 # This takes care of base prerequisites for Debian
 
 - name: Include ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
   tags: setup
 
 - name: Ensure apt-transport-https is installed

tasks/Debian/rabbit.yml

@@ -3,7 +3,8 @@
 # Specific to Debian
 
 - name: Include ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
   tags: rabbitmq
 
 - name: Ensure the RabbitMQ APT repo GPG key is present

tasks/Debian/redis.yml

@@ -3,7 +3,8 @@
 # Specific to Debian
 
 - name: Include ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
   tags: redis
 
 - name: Ensure redis is installed

tasks/Fedora/rabbit.yml

@@ -3,7 +3,8 @@
 # Specific to Fedora
 
 - name: Include ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
   tags: rabbitmq
 
 - name: Configure RabbitMQ GPG keys in the RPM keyring

tasks/Fedora/redis.yml

@@ -3,7 +3,8 @@
 # Specific to Fedora
 
 - name: Include ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
   tags: redis
 
 - name: Ensure jemalloc is installed as a dependency of Redis

tasks/FreeBSD/dashboard.yml

@@ -3,7 +3,8 @@
 # Specific to FreeBSD
 
 - name: Include ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
   tags: dashboard
 
 - name: Ensure Uchiwa (dashboard) dependencies are installed

tasks/FreeBSD/main.yml

@@ -3,13 +3,14 @@
 # This takes care of base prerequisites for FreeBSD
 
 - name: Include ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
   tags: setup
 
 - name: Ensure the Sensu group is present
   tags: setup
   group:
-    name: {{ sensu_group_name }}
+    name: "{{ sensu_group_name }}"
     state: present
 
 - name: Ensure the Sensu user is present

tasks/FreeBSD/rabbit.yml

@@ -3,7 +3,8 @@
 # Specific to FreeBSD
 
 - name: Include ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
   tags: rabbitmq
 
 - name: Ensure RabbitMQ is installed

tasks/FreeBSD/redis.yml

@@ -3,7 +3,8 @@
 # Specific to FreeBSD
 
 - name: Include ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
   tags: redis
 
 - name: Ensure redis is installed

tasks/OpenBSD/dashboard.yml

@@ -3,7 +3,8 @@
 # Specific to OpenBSD
 
 - name: Include ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
   tags: dashboard
 
 - name: Ensure Uchiwa (dashboard) dependencies are installed

tasks/OpenBSD/main.yml

@@ -3,7 +3,8 @@
 # This takes care of base prerequisites for OpenBSD
 
 - name: Include ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
   tags: setup
 
 - name: Ensure the Sensu group is present
@@ -45,7 +46,7 @@
   tags: setup
   gem:
     name: sensu
-    repository: "{{ sensu_gem_repository | default('https://api.rubygems.org/')}}"
+    repository: "{{ sensu_gem_repository | default('https://api.rubygems.org/') }}"
     user_install: no
     version: "{{ sensu_gem_version }}"
     executable: /usr/local/bin/gem23

tasks/OpenBSD/rabbit.yml

@@ -3,7 +3,8 @@
 # Specific to OpenBSD
 
 - name: Include ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
   tags: rabbitmq
 
 - name: Ensure RabbitMQ is installed

tasks/OpenBSD/redis.yml

@@ -3,7 +3,8 @@
 # Specific to OpenBSD
 
 - name: Include ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
   tags: redis
 
 - name: Ensure redis is installed

tasks/SmartOS/client.yml

@@ -3,7 +3,8 @@
 # Specific to Joyent SmartOS
 
 - name: Include ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
   tags: client
 
 - name: Deploy Sensu client service manifest

tasks/SmartOS/dashboard.yml

@@ -3,7 +3,8 @@
 # Specific to Joyent SmartOS
 
 - name: Include ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
   tags: dashboard
 
 - name: Ensure Uchiwa (dashboard) dependencies are installed
@@ -84,7 +85,7 @@
     src: uchiwa.smartos_smf_manifest.xml.j2
     owner: root
     group: root
-    mode: 644
+    mode: 0644
   notify: import uchiwa service
 
 - meta: flush_handlers

tasks/SmartOS/main.yml

@@ -3,7 +3,8 @@
 # This takes care of base prerequisites for Joyent SmartOS
 
 - name: Include ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
   tags: setup
 
 - name: Ensure the Sensu group is present

tasks/SmartOS/redis.yml

@@ -3,7 +3,8 @@
 # Specific to Ubuntu
 
 - name: Include ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
   tags: redis
 
 - name: Ensure redis is installed

tasks/SmartOS/server.yml

@@ -4,7 +4,8 @@
 # Specific to SmartOS
 
 - name: Include ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
   tags: server
 
 - name: Deploy Sensu server service manifest

tasks/Ubuntu/dashboard.yml

@@ -3,7 +3,8 @@
 # Specific to Ubuntu
 
 - name: Include ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
   tags: dashboard
 
 - name: Install Uchiwa

tasks/Ubuntu/main.yml

@@ -3,7 +3,8 @@
 # This takes care of base prerequisites for Ubuntu
 
 - name: Include ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
   tags: setup
 
 - name: Ensure that https transport is ready

tasks/Ubuntu/rabbit.yml

@@ -3,7 +3,8 @@
 # Specific to Ubuntu
 
 - name: Include ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
   tags: rabbitmq
 
 - name: Ensure the RabbitMQ APT repo GPG key is present

tasks/Ubuntu/redis.yml

@@ -3,7 +3,8 @@
 # Specific to Ubuntu
 
 - name: Include ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
 
 - name: Ensure redis is installed
   apt:

tasks/client.yml

@@ -2,7 +2,8 @@
 # tasks/client.yml: Deploy various client-side configurations for Sensu
 
 - name: Include ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
   tags: client
 
 - name: Deploy Sensu client service configuration

tasks/common.yml

@@ -2,7 +2,8 @@
 # tasks/common.yml: Deploy configurations common to client and server for Sensu
 
 - name: Include ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
 
 - name: Ensure the Sensu config directory is present
   file:

tasks/main.yml

@@ -2,7 +2,8 @@
 # tasks/main.yml: "Master" playbook for the sensu.sensu role
 
 - name: Include distribution specific variables
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
 
 - include_tasks: "{{ role_path }}/tasks/{{ ansible_distribution }}/main.yml"
   tags: setup

tasks/plugins.yml

@@ -2,7 +2,8 @@
 # tasks/plugins.yml: Deploy available checks/plugins/handlers/filters/mutators
 
 - name: Include ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
 
 - name: Ensure Sensu plugin directory exists
   file:
@@ -79,7 +80,7 @@
 - name: Deploy check/handler/filter/mutator definitions to the master
   template:
     src: "{{ item }}"
-    dest: "{{ sensu_config_path }}/conf.d/{{ item | basename | regex_replace('.j2', '')}}"
+    dest: "{{ sensu_config_path }}/conf.d/{{ item | basename | regex_replace('.j2', '') }}"
     owner: "{{ sensu_user_name }}"
     group: "{{ sensu_group_name }}"
   when: sensu_master
@@ -99,7 +100,7 @@
 - name: Deploy client definitions
   copy:
     src: "{{ static_data_store }}/sensu/client_definitions/{{ item }}/"
-    dest: "{{ sensu_config_path }}/conf.d/{{ item | basename | regex_replace('.j2', '')}}"
+    dest: "{{ sensu_config_path }}/conf.d/{{ item | basename | regex_replace('.j2', '') }}"
     owner: "{{ sensu_user_name }}"
     group: "{{ sensu_group_name }}"
   when:

tasks/rabbit.yml

@@ -2,7 +2,8 @@
 # tasks/rabbit.yml: Deploy RabbitMQ and set-up vhost for Sensu messaging
 
 - name: Include ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
   tags: rabbitmq
 
 - include_tasks: "{{ ansible_distribution }}/rabbit.yml"

tasks/server.yml

@@ -2,7 +2,8 @@
 # tasks/server.yml: Deploy Sensu Server/API
 
 - name: Include ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
   tags: server
 
 - name: Deploy Sensu server API configuration

tasks/ssl.yml

@@ -2,7 +2,8 @@
 # tasks/ssl.yml: Deploy the client SSL cert/key to client systems
 
 - name: Include ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
 
 - name: Ensure Sensu SSL directory exists
   file:

tasks/ssl_generate.yml

@@ -3,7 +3,8 @@
 # data store for deployment to clients
 
 - name: Include ansible_distribution vars
-  include_vars: "{{ ansible_distribution }}.yml"
+  include_vars:
+    file: "{{ ansible_distribution }}.yml"
 
 - name: Ensure OpenSSL is installed
   package: