Merge pull request #69 from jaredledvina/feature/improve-galaxy-score

Feature/improve galaxy score

.yamllint

@@ -1,11 +1,21 @@
+---
+# https://github.com/ansible/galaxy/blob/devel/galaxy/importer/linters/yamllint.yaml
 extends: default
 
 rules:
-  braces:
-    max-spaces-inside: 1
-    level: error
-  brackets:
-    max-spaces-inside: 1
-    level: error
+  braces: {max-spaces-inside: 1, level: error}
+  brackets: {max-spaces-inside: 1, level: error}
+  colons: {max-spaces-after: -1, level: error}
+  commas: {max-spaces-after: -1, level: error}
+  comments: disable
+  comments-indentation: disable
+  document-start: disable
+  empty-lines: {max: 3, level: error}
+  hyphens: {level: error}
+  indentation: disable
+  key-duplicates: enable
   line-length: disable
+  new-line-at-end-of-file: disable
+  new-lines: {type: unix}
+  trailing-spaces: disable
   truthy: disable

Pipfile

@@ -8,7 +8,7 @@ ansible = "*"
 docker-py = "*"
 
 [dev-packages]
-molecule = "*"
+molecule = "==v2.20a2"
 
 [requires]
 python_version = "2.7"

tasks/config/component.yml

@@ -12,7 +12,7 @@
     mode: "{{ sensu_go_final_configs[component]['default']['mode'] | default(sensu_go_final_configs.DEFAULT.file_mode) }}"
   when: sensu_go_final_configs[component]['default'] is defined
 
-- name: Ensure /etc/sysconfig/sensu-{{component }} is configured
+- name: Ensure /etc/sysconfig/sensu-{{ component }} is configured
   template:
     src: component-sysconfig.j2
     dest: "/etc/sysconfig/sensu-{{ component }}"
@@ -25,7 +25,7 @@
   template:
     src: component.yml.j2
     dest: "{{ sensu_go_config_dir.path }}/{{ sensu_go_final_configs[component]['file']['name'] }}"
-    owner: "{{ sensu_go_final_configs[component]['file']['owner'] | default(sensu_go_final_configs['DEFAULT']['owner'])}}"
+    owner: "{{ sensu_go_final_configs[component]['file']['owner'] | default(sensu_go_final_configs['DEFAULT']['owner']) }}"
     group: "{{ sensu_go_final_configs[component]['file']['group'] | default(sensu_go_final_configs['DEFAULT']['group']) }}"
     mode: "{{ sensu_go_final_configs[component]['file']['mode'] | default(sensu_go_final_configs['DEFAULT']['file_mode']) }}"
   when: sensu_go_final_configs[component]['config'] is defined

tasks/config/main.yml

@@ -2,6 +2,6 @@
 - name: Ensure config directory is set up
   file:
     path: "{{ sensu_go_config_dir.path }}"
-    owner: "{{ sensu_go_config_dir.owner}}"
+    owner: "{{ sensu_go_config_dir.owner }}"
     group: "{{ sensu_go_config_dir.group }}"
     mode: "{{ sensu_go_config_dir.mode }}"

tasks/repo/dnf.yml

@@ -14,3 +14,9 @@
 - name: Flush handlers
   meta: flush_handlers
   when: sensu_go_manage_repo or sensu_go_manage_community_repo
+
+- name: Cleanup - Remove old Sensu prerelease repos
+  file:
+    path: /etc/yum.repos.d/sensu_prerelease
+    state: absent
+  notify: yum-clean-metadata

tasks/repo/sensu_community/dnf.yml

@@ -34,14 +34,3 @@
     sslverify: "{{ sensu_go_final_community_repos[ansible_pkg_mgr]['sslverify'] }}"
     metadata_expire: "{{ sensu_go_final_community_repos[ansible_pkg_mgr]['metadata_expire'] }}"
   when: sensu_go_final_community_repos[ansible_pkg_mgr]['rpm-src'] is defined
-
-# HACK: https://github.com/ansible/ansible/issues/20711#issuecomment-306260869
-# Can be removed once we're running w/ a version of Ansible that has https://github.com/ansible/ansible/pull/35989
-- name: Make yum cache to import Sensu Go Community GPG keys
-  command: "yum -q makecache -y --disablerepo='*' --enablerepo='{{ item }}'"
-  args:
-    warn: false
-  when: sensu_go_import_community_key.changed
-  with_items:
-    - sensu_go_community
-    - sensu_go_community-source

tasks/repo/sensu_community/yum.yml

@@ -37,7 +37,8 @@
 
 # HACK: https://github.com/ansible/ansible/issues/20711#issuecomment-306260869
 # Can be removed once we're running w/ a version of Ansible that has https://github.com/ansible/ansible/pull/35989
-- name: Make yum cache to import Sensu Go Community GPG keys
+# Update: Looks like only CentOS 6 requires this hack
+- name: Make yum cache to import Sensu Go Community GPG keys # noqa 503 - Order matters for this task
   command: "yum -q makecache -y --disablerepo='*' --enablerepo='{{ item }}'"
   args:
     warn: false

tasks/repo/sensu_go/apt.yml

@@ -29,6 +29,3 @@
     path: /etc/apt/sources.list.ld/sensu_prerelease
     state: absent
   notify: update apt cache
-
-- name: Flush handlers
-  meta: flush_handlers

tasks/repo/sensu_go/dnf.yml

@@ -40,14 +40,3 @@
     path: /etc/yum.repos.d/sensu_prerelease
     state: absent
   notify: yum-clean-metadata
-
-# HACK: https://github.com/ansible/ansible/issues/20711#issuecomment-306260869
-# Can be removed once we're running w/ a version of Ansible that has https://github.com/ansible/ansible/pull/35989
-- name: Make yum cache to import GPG keys
-  command: "yum -q makecache -y --disablerepo='*' --enablerepo='{{ item }}'"
-  args:
-    warn: false
-  when: sensu_go_import_key.changed
-  with_items:
-    - sensu_go
-    - sensu_go-source

tasks/repo/sensu_go/yum.yml

@@ -43,7 +43,8 @@
 
 # HACK: https://github.com/ansible/ansible/issues/20711#issuecomment-306260869
 # Can be removed once we're running w/ a version of Ansible that has https://github.com/ansible/ansible/pull/35989
-- name: Make yum cache to import GPG keys
+# Update: Looks like only CentOS 6 requires the hack
+- name: Make yum cache to import GPG keys # # noqa 503 - Order matters for this task
   command: "yum -q makecache -y --disablerepo='*' --enablerepo='{{ item }}'"
   args:
     warn: false

tasks/repo/yum.yml

@@ -14,3 +14,9 @@
 - name: Flush handlers
   meta: flush_handlers
   when: sensu_go_manage_repo or sensu_go_manage_community_repo
+
+- name: Cleanup - Remove old Sensu prerelease repos
+  file:
+    path: /etc/yum.repos.d/sensu_prerelease
+    state: absent
+  notify: yum-clean-metadata

tasks/service/backend.yml

@@ -6,7 +6,7 @@
 - name: Ensure sensu-backend service state
   service:
     name: sensu-backend
-    enabled: "{{ sensu_go_final_services.backend.enabled | default(omit)}}"
+    enabled: "{{ sensu_go_final_services.backend.enabled | default(omit) }}"
     state: "{{ sensu_go_final_services.backend.state }}"
   register: sensu_go_backend_service_state