From 9d974bdf0c0303bb44741693accfd451723b2275 Mon Sep 17 00:00:00 2001 From: Aaron Guise Date: Tue, 13 Oct 2020 23:40:02 +1300 Subject: [PATCH] Fix linting issues --- .ansible-lint | 3 +++ meta/main.yml | 3 +-- tasks/RedHat-register.yml | 1 + tasks/RedHat.yml | 4 ++-- tasks/Windows-register.yml | 3 ++- tasks/Windows.yml | 4 ++-- tasks/host-management.yml | 5 +++-- 7 files changed, 14 insertions(+), 9 deletions(-) create mode 100644 .ansible-lint diff --git a/.ansible-lint b/.ansible-lint new file mode 100644 index 0000000..9d9d206 --- /dev/null +++ b/.ansible-lint @@ -0,0 +1,3 @@ +# .ansible-lint │ +warn_list: # or 'skip_list' to silence them completely │ + - '106' # Role name {} does not match ``^[a-z][a-z0-9_]+$`` pattern \ No newline at end of file diff --git a/meta/main.yml b/meta/main.yml index 9b0350d..0faa9a5 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -5,7 +5,7 @@ galaxy_info: # If the issue tracker for your role is not on github, uncomment the # next line and provide a value # issue_tracker_url: http://example.com/issue/tracker - + license: MIT min_ansible_version: 2.9 @@ -34,4 +34,3 @@ galaxy_info: # Maximum 20 tags per role. dependencies: [] - \ No newline at end of file diff --git a/tasks/RedHat-register.yml b/tasks/RedHat-register.yml index 672953d..51299d7 100644 --- a/tasks/RedHat-register.yml +++ b/tasks/RedHat-register.yml @@ -2,3 +2,4 @@ shell: | cmk-update-agent register -H $(hostname -s) --user {{ cmk_username }} \ --secret {{ cmk_secret }} + changed_when: false diff --git a/tasks/RedHat.yml b/tasks/RedHat.yml index 7f44b97..9f6a88b 100644 --- a/tasks/RedHat.yml +++ b/tasks/RedHat.yml @@ -18,10 +18,10 @@ dest: /tmp/check-mk-agent.rpm - name: Ensure check_mk_agent installed - yum: + yum: name: /tmp/check-mk-agent.rpm state: installed - notify: + notify: - restart xinetd - cmk fresh install diff --git a/tasks/Windows-register.yml b/tasks/Windows-register.yml index e9b3f4f..86e2d75 100644 --- a/tasks/Windows-register.yml +++ b/tasks/Windows-register.yml @@ -1,5 +1,6 @@ - name: Register with CheckMK Update Server win_shell: | - C:\ProgramData\checkmk\agent\plugins\cmk-update-agent.exe register -H $env:computername ` + C:\ProgramData\checkmk\agent\plugins\cmk-update-agent.exe register ` + -H $env:computername ` --user {{ cmk_username }} ` --secret {{ cmk_secret }} \ No newline at end of file diff --git a/tasks/Windows.yml b/tasks/Windows.yml index d379812..d414539 100644 --- a/tasks/Windows.yml +++ b/tasks/Windows.yml @@ -3,13 +3,13 @@ win_file: path: "c:/temp/" state: directory - + - name: Retrieve copy of agent win_get_url: url: "{{ cmk_msi_agent }}{{ cmk_auth }}" dest: "c:/temp/check-mk-agent.msi" changed_when: false - + - name: Ensure agent is installed win_package: path: "c:/temp/check-mk-agent.msi" diff --git a/tasks/host-management.yml b/tasks/host-management.yml index 4dfb394..3c89d27 100644 --- a/tasks/host-management.yml +++ b/tasks/host-management.yml @@ -11,7 +11,7 @@ "ipaddress": "{{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }}" }, "folder": "{{ cmk_folder | default('Unsorted') }}", - "hostname": "{{inventory_hostname}}" + "hostname": "{{ inventory_hostname }}" } body_format: raw return_content: yes @@ -20,7 +20,8 @@ delegate_to: localhost when: cmk_add_host -- set_fact: +- name: Parse result + set_fact: output: "{{ res.content | from_json }}" when: cmk_add_host