diff --git a/.ansible-lint b/.ansible-lint index 09d3f3c..16bee8b 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -8,4 +8,4 @@ skip_list: # or 'skip_list' to silence them completely - name[casing] - deprecated-local-action -warn_list: [] # or 'skip_list' to silence them completely \ No newline at end of file +warn_list: [] # or 'skip_list' to silence them completely diff --git a/tasks/downloads/samba/main.yml b/tasks/downloads/samba/main.yml index 6def91a..5f93952 100644 --- a/tasks/downloads/samba/main.yml +++ b/tasks/downloads/samba/main.yml @@ -30,8 +30,9 @@ debug: msg: "{{ msg.split('\n') }}" when: cmk_debug + - name: Copy archive from samba_share. (No-Log) - command: > + shell: > smbget 'smb:{{ (cmk_download_path + '/' + cmk_installer) | reslash }}' -U '{{ cmk_smb_username }}%{{ cmk_smb_password }}' args: @@ -41,6 +42,7 @@ no_log: true # Turn off logging due to password exposure when: not cmk_debug | bool delegate_to: localhost + - name: Copy archive from samba_share. (Debug) command: > smbget 'smb:{{ (cmk_download_path + '/' + cmk_installer) | reslash }}' -U '{{ cmk_smb_username | trim }}%{{ cmk_smb_password | trim }} diff --git a/tasks/host-management.yml b/tasks/host-management.yml index 3204eb6..0d3f0b7 100644 --- a/tasks/host-management.yml +++ b/tasks/host-management.yml @@ -1,6 +1,6 @@ --- -- include_tasks: host-management/{{ ansible_os_family}}/check.yml +- include_tasks: host-management/{{ ansible_os_family }}/check.yml - name: Set facts # noqa jinja[spacing] set_fact: @@ -18,13 +18,13 @@ var: '{{ item }}' with_items: [cmk_major, cmk_minor, cmk_patch, cmk_edition] -- include_tasks: host-management/{{ ansible_os_family}}/legacy.yml +- include_tasks: host-management/{{ ansible_os_family }}/legacy.yml when: > cmk_add_host and (cmk_major | int <= 2 and cmk_minor | int < 2 or cmk_force_install) -- include_tasks: host-management/{{ ansible_os_family}}/modern.yml +- include_tasks: host-management/{{ ansible_os_family }}/modern.yml when: >- cmk_add_host and (cmk_major | int >= 2 and diff --git a/tasks/host-management/RedHat/check.yml b/tasks/host-management/RedHat/check.yml index ab46ffd..f69b59b 100644 --- a/tasks/host-management/RedHat/check.yml +++ b/tasks/host-management/RedHat/check.yml @@ -8,4 +8,4 @@ Accept: application/json url: '{{ cmk_omd_protocol }}://{{ cmk_omd_host }}/{{ cmk_omd_site }}/check_mk/api/1.0/version' return_content: true - register: cmk_output \ No newline at end of file + register: cmk_output diff --git a/tasks/host-management/RedHat/legacy.yml b/tasks/host-management/RedHat/legacy.yml index 102e9aa..02cc252 100644 --- a/tasks/host-management/RedHat/legacy.yml +++ b/tasks/host-management/RedHat/legacy.yml @@ -24,7 +24,7 @@ set_fact: output: '{{ res.content | from_json }}' when: cmk_add_host - + - name: cmk_discovery (legacy) uri: method: POST @@ -36,7 +36,7 @@ become: false when: > cmk_add_host and output.result_code == 0 or cmk_force_install - + - name: cmk_apply (legacy) uri: method: POST diff --git a/tasks/host-management/Windows/check.yml b/tasks/host-management/Windows/check.yml index 50ff436..d143750 100644 --- a/tasks/host-management/Windows/check.yml +++ b/tasks/host-management/Windows/check.yml @@ -8,4 +8,4 @@ Accept: application/json url: '{{ cmk_omd_protocol }}://{{ cmk_omd_host }}/{{ cmk_omd_site }}/check_mk/api/1.0/version' return_content: true - register: cmk_output \ No newline at end of file + register: cmk_output