From 2570377976f337f0620cfc1e907dd5598f47d42d Mon Sep 17 00:00:00 2001 From: jurgenhaas <juergen@paragon-es.de> Date: Tue, 11 Jun 2019 18:35:58 +0200 Subject: [PATCH] ansible-playbooks/general#85 Linting --- defaults/main.yml | 6 ++++-- tasks/main.yml | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index b1c539d..ae021a6 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,3 +1,5 @@ +--- + zabbix_agent_url: http://repo.zabbix.com/zabbix/3.0/ubuntu/pool/main/z/zabbix-release/zabbix-release_3.0-1+xenial_all.deb zabbix_agent_logfile_size: 0 @@ -6,8 +8,8 @@ zabbix_agent_server_active: 127.0.0.1 zabbix_agent_hostname: Zabbix server zabbix_tls_connect: unencrypted zabbix_tls_accept: unencrypted -zabbix_tls_psk_identity: -zabbix_tls_psk_file: +zabbix_tls_psk_identity: '' +zabbix_tls_psk_file: '' zabbix_agent_userparameter: mysql: diff --git a/tasks/main.yml b/tasks/main.yml index fc18469..bbd9e27 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -9,20 +9,20 @@ - block: - - name: Check availability of Zabbix - stat: - path: /etc/init.d/zabbix-agent - register: zabbix_available + - name: Check availability of Zabbix + stat: + path: /etc/init.d/zabbix-agent + register: zabbix_available - - import_tasks: install.yml - when: not zabbix_available.stat.exists + - import_tasks: install.yml + when: not zabbix_available.stat.exists - - import_tasks: config.yml + - import_tasks: config.yml - - name: Remember that this role had been run - set_fact: - role_zabbix_agent_completed: yes - tags: - - always + - name: Remember that this role had been run + set_fact: + role_zabbix_agent_completed: yes + tags: + - always when: not excluded_roles or "zabbix_agent" not in excluded_roles and role_zabbix_agent_completed is not defined -- GitLab