From 10342b025c86726e56dc145e0bb32541002c0dc0 Mon Sep 17 00:00:00 2001 From: EKbfh Date: Tue, 21 Sep 2021 14:13:45 +0000 Subject: [PATCH] Merge branch 'EKbfh-master-patch-27077' into 'master' Fix ansible changed_when See merge request noc/noc!5748 (cherry picked from commit 0671f995f2469e7b5747ab8ab82f1bd9bfad1364) 668cf2e2 Update ansible/system_roles/consul/tasks/main.yml 84188716 Update ansible/system_roles/consul/tasks/main.yml 115723a0 Update ansible/system_roles/mongod/tasks/main.yml c4710d07 Fix change_when error in ansible 2.9.14+ --- ansible/noc_roles/migrate/tasks/main.yml | 2 +- ansible/noc_roles/noc/tasks/tests.yml | 4 ++-- ansible/noc_roles/post/tasks/main.yml | 4 ++-- ansible/noc_roles/pre/tasks/main.yml | 2 +- ansible/noc_roles/scheduler/tasks/os/FreeBSD/main.yml | 0 ansible/noc_roles/scheduler/tasks/os/OracleLinux/main.yml | 0 ansible/noc_roles/selfmon/tasks/os/CentOS/main.yml | 0 ansible/noc_roles/selfmon/tasks/os/OracleLinux/main.yml | 0 ansible/noc_roles/selfmon/tasks/os/Ubuntu/main.yml | 0 .../noc_roles/syslogcollector/tasks/os/FreeBSD/main.yml | 0 .../syslogcollector/tasks/os/OracleLinux/main.yml | 0 ansible/noc_roles/tgsender/tasks/os/Debian/main.yml | 0 ansible/noc_roles/trapcollector/tasks/os/Debian/main.yml | 0 ansible/noc_roles/web/tasks/os/Debian/main.yml | 0 ansible/system_roles/clickhouse/tasks/checks.yml | 4 ++-- ansible/system_roles/clickhouse/tasks/tests.yml | 2 +- ansible/system_roles/consul-template/tasks/install.yml | 2 +- ansible/system_roles/consul-template/tasks/tests.yml | 2 +- ansible/system_roles/consul/tasks/install.yml | 2 +- ansible/system_roles/consul/tasks/main.yml | 2 +- ansible/system_roles/consul/tasks/os/CentOS/main.yml | 2 +- ansible/system_roles/consul/tasks/os/OracleLinux/main.yml | 2 +- .../system_roles/consul/tasks/service_config_update.yml | 2 +- ansible/system_roles/consul/tasks/tests.yml | 4 ++-- ansible/system_roles/goss/tasks/os/CentOS/main.yml | 0 ansible/system_roles/goss/tasks/os/Debian/main.yml | 0 ansible/system_roles/goss/tasks/os/Ubuntu/main.yml | 0 ansible/system_roles/grafana/tasks/tests.yml | 4 ++-- ansible/system_roles/liftbridge/tasks/install.yml | 2 +- ansible/system_roles/mongod/tasks/main.yml | 2 +- ansible/system_roles/mongod/tasks/tests.yml | 6 +++--- ansible/system_roles/nats/tasks/install.yml | 2 +- ansible/system_roles/nats/tasks/os/FreeBSD/main.yml | 0 ansible/system_roles/nginx/tasks/tests.yml | 6 +++--- ansible/system_roles/nsqd/tasks/tests.yml | 8 ++++---- ansible/system_roles/nsqlookupd/tasks/tests.yml | 8 ++++---- ansible/system_roles/postgres/tasks/main.yml | 4 ++-- ansible/system_roles/postgres/tasks/tests.yml | 4 ++-- 38 files changed, 41 insertions(+), 41 deletions(-) mode change 100644 => 100755 ansible/noc_roles/scheduler/tasks/os/FreeBSD/main.yml mode change 100644 => 100755 ansible/noc_roles/scheduler/tasks/os/OracleLinux/main.yml mode change 100644 => 100755 ansible/noc_roles/selfmon/tasks/os/CentOS/main.yml mode change 100755 => 100644 ansible/noc_roles/selfmon/tasks/os/OracleLinux/main.yml mode change 100755 => 100644 ansible/noc_roles/selfmon/tasks/os/Ubuntu/main.yml mode change 100755 => 100644 ansible/noc_roles/syslogcollector/tasks/os/FreeBSD/main.yml mode change 100755 => 100644 ansible/noc_roles/syslogcollector/tasks/os/OracleLinux/main.yml mode change 100755 => 100644 ansible/noc_roles/tgsender/tasks/os/Debian/main.yml mode change 100755 => 100644 ansible/noc_roles/trapcollector/tasks/os/Debian/main.yml mode change 100644 => 100755 ansible/noc_roles/web/tasks/os/Debian/main.yml mode change 100644 => 100755 ansible/system_roles/goss/tasks/os/CentOS/main.yml mode change 100644 => 100755 ansible/system_roles/goss/tasks/os/Debian/main.yml mode change 100755 => 100644 ansible/system_roles/goss/tasks/os/Ubuntu/main.yml mode change 100644 => 100755 ansible/system_roles/nats/tasks/os/FreeBSD/main.yml diff --git a/ansible/noc_roles/migrate/tasks/main.yml b/ansible/noc_roles/migrate/tasks/main.yml index 234cd79187..52a1750a34 100755 --- a/ansible/noc_roles/migrate/tasks/main.yml +++ b/ansible/noc_roles/migrate/tasks/main.yml @@ -55,7 +55,7 @@ chdir: "{{ noc_root }}" become: "True" become_user: "{{ noc_user }}" - changed_when: "False" + changed_when: false - name: Apply pools command: "{{ noc_root }}/scripts/deploy/apply-pools" diff --git a/ansible/noc_roles/noc/tasks/tests.yml b/ansible/noc_roles/noc/tasks/tests.yml index 66271760f9..5fe5b67887 100644 --- a/ansible/noc_roles/noc/tasks/tests.yml +++ b/ansible/noc_roles/noc/tasks/tests.yml @@ -3,7 +3,7 @@ - name: check if supervisord running command: pgrep -f supervisord -c failed_when: "False" - changed_when: "False" + changed_when: false register: supervisord_running check_mode: "False" @@ -17,7 +17,7 @@ - name: check if noc services are down shell: /opt/noc/noc ctl status | grep -v RUNNING become: "True" - changed_when: "False" + changed_when: false register: noc_status failed_when: "False" check_mode: "False" diff --git a/ansible/noc_roles/post/tasks/main.yml b/ansible/noc_roles/post/tasks/main.yml index 3d23de1e88..9165f04ee7 100755 --- a/ansible/noc_roles/post/tasks/main.yml +++ b/ansible/noc_roles/post/tasks/main.yml @@ -3,7 +3,7 @@ - name: check if noc running command: "{{ noc_root }}/noc ctl status" check_mode: "False" - changed_when: "False" + changed_when: false register: noc_ctl_status when: tower_serial_restart_noc @@ -17,7 +17,7 @@ - name: Serial NOC restart command: "{{ noc_root }}/noc ctl serialrestart all" when: tower_serial_restart_noc - changed_when: "False" + changed_when: false - name: Restart NOC node service: diff --git a/ansible/noc_roles/pre/tasks/main.yml b/ansible/noc_roles/pre/tasks/main.yml index 68b5abc7ee..a30dfc49dd 100755 --- a/ansible/noc_roles/pre/tasks/main.yml +++ b/ansible/noc_roles/pre/tasks/main.yml @@ -41,7 +41,7 @@ state: stopped become: "True" failed_when: "False" - changed_when: "False" + changed_when: false when: tower_stop_noc - name: Setup hostname diff --git a/ansible/noc_roles/scheduler/tasks/os/FreeBSD/main.yml b/ansible/noc_roles/scheduler/tasks/os/FreeBSD/main.yml old mode 100644 new mode 100755 diff --git a/ansible/noc_roles/scheduler/tasks/os/OracleLinux/main.yml b/ansible/noc_roles/scheduler/tasks/os/OracleLinux/main.yml old mode 100644 new mode 100755 diff --git a/ansible/noc_roles/selfmon/tasks/os/CentOS/main.yml b/ansible/noc_roles/selfmon/tasks/os/CentOS/main.yml old mode 100644 new mode 100755 diff --git a/ansible/noc_roles/selfmon/tasks/os/OracleLinux/main.yml b/ansible/noc_roles/selfmon/tasks/os/OracleLinux/main.yml old mode 100755 new mode 100644 diff --git a/ansible/noc_roles/selfmon/tasks/os/Ubuntu/main.yml b/ansible/noc_roles/selfmon/tasks/os/Ubuntu/main.yml old mode 100755 new mode 100644 diff --git a/ansible/noc_roles/syslogcollector/tasks/os/FreeBSD/main.yml b/ansible/noc_roles/syslogcollector/tasks/os/FreeBSD/main.yml old mode 100755 new mode 100644 diff --git a/ansible/noc_roles/syslogcollector/tasks/os/OracleLinux/main.yml b/ansible/noc_roles/syslogcollector/tasks/os/OracleLinux/main.yml old mode 100755 new mode 100644 diff --git a/ansible/noc_roles/tgsender/tasks/os/Debian/main.yml b/ansible/noc_roles/tgsender/tasks/os/Debian/main.yml old mode 100755 new mode 100644 diff --git a/ansible/noc_roles/trapcollector/tasks/os/Debian/main.yml b/ansible/noc_roles/trapcollector/tasks/os/Debian/main.yml old mode 100755 new mode 100644 diff --git a/ansible/noc_roles/web/tasks/os/Debian/main.yml b/ansible/noc_roles/web/tasks/os/Debian/main.yml old mode 100644 new mode 100755 diff --git a/ansible/system_roles/clickhouse/tasks/checks.yml b/ansible/system_roles/clickhouse/tasks/checks.yml index 6b08feefab..b05772bff4 100644 --- a/ansible/system_roles/clickhouse/tasks/checks.yml +++ b/ansible/system_roles/clickhouse/tasks/checks.yml @@ -28,7 +28,7 @@ command: grep -q sse4_2 /proc/cpuinfo register: sse42_support failed_when: "False" - changed_when: "False" + changed_when: false check_mode: "False" - name: fail if SSE 4.2 not supported @@ -47,7 +47,7 @@ command: grep -q SSE4.2 /var/run/dmesg.boot register: sse42_support failed_when: "False" - changed_when: "False" + changed_when: false check_mode: "False" - name: fail if SSE 4.2 not supported diff --git a/ansible/system_roles/clickhouse/tasks/tests.yml b/ansible/system_roles/clickhouse/tasks/tests.yml index 39612be603..cdffdc7f95 100644 --- a/ansible/system_roles/clickhouse/tasks/tests.yml +++ b/ansible/system_roles/clickhouse/tasks/tests.yml @@ -3,7 +3,7 @@ - name: check if clickhouse-server running command: pgrep -f clickhouse-server -c failed_when: "False" - changed_when: "False" + changed_when: false register: clickhouse_server_running check_mode: "False" diff --git a/ansible/system_roles/consul-template/tasks/install.yml b/ansible/system_roles/consul-template/tasks/install.yml index 6ad959028e..d8c5edbdb5 100644 --- a/ansible/system_roles/consul-template/tasks/install.yml +++ b/ansible/system_roles/consul-template/tasks/install.yml @@ -17,7 +17,7 @@ delegate_to: 127.0.0.1 become: "False" run_once: "True" - changed_when: "False" + changed_when: false - name: Download Consul-template get_url: diff --git a/ansible/system_roles/consul-template/tasks/tests.yml b/ansible/system_roles/consul-template/tasks/tests.yml index 9803c1a3d0..597b532792 100644 --- a/ansible/system_roles/consul-template/tasks/tests.yml +++ b/ansible/system_roles/consul-template/tasks/tests.yml @@ -3,7 +3,7 @@ - name: check if consul_template running command: pgrep -x consul-template -c failed_when: "False" - changed_when: "False" + changed_when: false register: consul_template_running check_mode: "False" diff --git a/ansible/system_roles/consul/tasks/install.yml b/ansible/system_roles/consul/tasks/install.yml index c5ba98f90c..ca48fbd4ef 100644 --- a/ansible/system_roles/consul/tasks/install.yml +++ b/ansible/system_roles/consul/tasks/install.yml @@ -17,7 +17,7 @@ delegate_to: 127.0.0.1 become: "False" run_once: "True" - changed_when: "False" + changed_when: false - name: Download Consul get_url: diff --git a/ansible/system_roles/consul/tasks/main.yml b/ansible/system_roles/consul/tasks/main.yml index 0da52257ac..265d8dc11f 100644 --- a/ansible/system_roles/consul/tasks/main.yml +++ b/ansible/system_roles/consul/tasks/main.yml @@ -2,7 +2,7 @@ # File: main.yml - Main tasks for Consul - name: make servers group - changed_when: "False" + changed_when: false add_host: group: svc-consul-server host: "{{ item }}" diff --git a/ansible/system_roles/consul/tasks/os/CentOS/main.yml b/ansible/system_roles/consul/tasks/os/CentOS/main.yml index a7b2cfb93f..3631931b9b 100644 --- a/ansible/system_roles/consul/tasks/os/CentOS/main.yml +++ b/ansible/system_roles/consul/tasks/os/CentOS/main.yml @@ -28,7 +28,7 @@ name: firewalld check_mode: "True" register: firewalld_state - changed_when: "False" + changed_when: false ignore_errors: "True" tags: - config diff --git a/ansible/system_roles/consul/tasks/os/OracleLinux/main.yml b/ansible/system_roles/consul/tasks/os/OracleLinux/main.yml index 4910df02e7..c427d8e106 100644 --- a/ansible/system_roles/consul/tasks/os/OracleLinux/main.yml +++ b/ansible/system_roles/consul/tasks/os/OracleLinux/main.yml @@ -28,7 +28,7 @@ name: firewalld check_mode: "True" register: firewalld_state - changed_when: "False" + changed_when: false ignore_errors: "True" tags: - config diff --git a/ansible/system_roles/consul/tasks/service_config_update.yml b/ansible/system_roles/consul/tasks/service_config_update.yml index 4e6d4b06e5..66bbbd807f 100644 --- a/ansible/system_roles/consul/tasks/service_config_update.yml +++ b/ansible/system_roles/consul/tasks/service_config_update.yml @@ -13,7 +13,7 @@ environment: ANSIBLE_JINJA2_NATIVE: true register: consul_key_response - changed_when: "False" + changed_when: false check_mode: "False" # if default value is unset provide default json diff --git a/ansible/system_roles/consul/tasks/tests.yml b/ansible/system_roles/consul/tasks/tests.yml index f71990e22c..c008e8f3f1 100644 --- a/ansible/system_roles/consul/tasks/tests.yml +++ b/ansible/system_roles/consul/tasks/tests.yml @@ -3,7 +3,7 @@ - name: check if consul running command: pgrep -x consul -c failed_when: "False" - changed_when: "False" + changed_when: false register: consul_running check_mode: "False" @@ -26,7 +26,7 @@ uri: url: "http://127.0.0.1:8500/v1/health/node/{{ host }}/" register: consul_ping - changed_when: "False" + changed_when: false check_mode: "False" loop_control: loop_var: host diff --git a/ansible/system_roles/goss/tasks/os/CentOS/main.yml b/ansible/system_roles/goss/tasks/os/CentOS/main.yml old mode 100644 new mode 100755 diff --git a/ansible/system_roles/goss/tasks/os/Debian/main.yml b/ansible/system_roles/goss/tasks/os/Debian/main.yml old mode 100644 new mode 100755 diff --git a/ansible/system_roles/goss/tasks/os/Ubuntu/main.yml b/ansible/system_roles/goss/tasks/os/Ubuntu/main.yml old mode 100755 new mode 100644 diff --git a/ansible/system_roles/grafana/tasks/tests.yml b/ansible/system_roles/grafana/tasks/tests.yml index 4dd3a3d1de..19baaf446d 100644 --- a/ansible/system_roles/grafana/tasks/tests.yml +++ b/ansible/system_roles/grafana/tasks/tests.yml @@ -3,7 +3,7 @@ - name: check if grafana running command: pgrep -x grafana-server -c failed_when: "False" - changed_when: "False" + changed_when: false register: grafana_running check_mode: "False" @@ -35,7 +35,7 @@ url: "http://127.0.0.1:8500/v1/health/service/grafana" return_content: "True" register: consul_req - changed_when: "False" + changed_when: false check_mode: "False" - name: fail if no grafana found diff --git a/ansible/system_roles/liftbridge/tasks/install.yml b/ansible/system_roles/liftbridge/tasks/install.yml index ab39c7fd4b..f6d9d92c4c 100644 --- a/ansible/system_roles/liftbridge/tasks/install.yml +++ b/ansible/system_roles/liftbridge/tasks/install.yml @@ -17,7 +17,7 @@ delegate_to: 127.0.0.1 become: "False" run_once: "True" - changed_when: "False" + changed_when: false - name: Download Liftbridge get_url: diff --git a/ansible/system_roles/mongod/tasks/main.yml b/ansible/system_roles/mongod/tasks/main.yml index d1b5894a62..3450fae55a 100755 --- a/ansible/system_roles/mongod/tasks/main.yml +++ b/ansible/system_roles/mongod/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: make servers group - changed_when: "False" + changed_when: false add_host: group: svc-mongo-primary host: "{{ item }}" diff --git a/ansible/system_roles/mongod/tasks/tests.yml b/ansible/system_roles/mongod/tasks/tests.yml index 52270b25a6..45506abd7e 100644 --- a/ansible/system_roles/mongod/tasks/tests.yml +++ b/ansible/system_roles/mongod/tasks/tests.yml @@ -3,7 +3,7 @@ - name: check if mongod running command: pgrep -x mongod -c failed_when: "False" - changed_when: "False" + changed_when: false register: mongod_running check_mode: "False" @@ -16,7 +16,7 @@ - name: check mongo disk size shell: df /var/lib/mongo/ | grep -Po '/dev.+\K...(?=\%)' - changed_when: "False" + changed_when: false failed_when: "False" register: mongod_dir_size check_mode: "False" @@ -35,7 +35,7 @@ url: "http://127.0.0.1:8500/v1/health/service/mongo" return_content: "True" register: consul_req - changed_when: "False" + changed_when: false check_mode: "False" - name: fail if no mongo found diff --git a/ansible/system_roles/nats/tasks/install.yml b/ansible/system_roles/nats/tasks/install.yml index 3459ed76bd..7daa4cb891 100644 --- a/ansible/system_roles/nats/tasks/install.yml +++ b/ansible/system_roles/nats/tasks/install.yml @@ -17,7 +17,7 @@ delegate_to: 127.0.0.1 become: "False" run_once: "True" - changed_when: "False" + changed_when: false - name: Download Nats get_url: diff --git a/ansible/system_roles/nats/tasks/os/FreeBSD/main.yml b/ansible/system_roles/nats/tasks/os/FreeBSD/main.yml old mode 100644 new mode 100755 diff --git a/ansible/system_roles/nginx/tasks/tests.yml b/ansible/system_roles/nginx/tasks/tests.yml index 55100ecacd..08dfa0f7c7 100644 --- a/ansible/system_roles/nginx/tasks/tests.yml +++ b/ansible/system_roles/nginx/tasks/tests.yml @@ -3,7 +3,7 @@ - name: check if nginx running command: pgrep -x nginx -c failed_when: "False" - changed_when: "False" + changed_when: false register: nginx_running check_mode: "False" @@ -19,7 +19,7 @@ url: "https://{{ noc_web_host }}/ng_stats" validate_certs: "{{ not nginx_self_signed_cerificate }}" register: nginx_ping - changed_when: "False" + changed_when: false failed_when: "False" check_mode: "False" @@ -45,7 +45,7 @@ url: "https://{{ noc_web_host }}/api/login/index.html" validate_certs: "{{ not nginx_self_signed_cerificate }}" register: nginx_ping - changed_when: "False" + changed_when: false failed_when: "False" check_mode: "False" diff --git a/ansible/system_roles/nsqd/tasks/tests.yml b/ansible/system_roles/nsqd/tasks/tests.yml index ee9071f63a..b4bb7ec99d 100644 --- a/ansible/system_roles/nsqd/tasks/tests.yml +++ b/ansible/system_roles/nsqd/tasks/tests.yml @@ -3,7 +3,7 @@ - name: check if nsqd running command: pgrep -x nsqd -c failed_when: "False" - changed_when: "False" + changed_when: false register: nsqd_running check_mode: "False" @@ -18,7 +18,7 @@ uri: url: http://127.0.0.1:4151/ping register: nsqd_ping - changed_when: "False" + changed_when: false failed_when: "False" check_mode: "False" @@ -35,7 +35,7 @@ url: "http://127.0.0.1:8500/v1/health/service/nsqd" return_content: "True" register: consul_req - changed_when: "False" + changed_when: false check_mode: "False" - name: fail if no nsqd found @@ -51,7 +51,7 @@ url: "http://127.0.0.1:8500/v1/health/service/nsqdhttp" return_content: "True" register: consul_req - changed_when: "False" + changed_when: false check_mode: "False" - name: fail if no nsqdhttp found diff --git a/ansible/system_roles/nsqlookupd/tasks/tests.yml b/ansible/system_roles/nsqlookupd/tasks/tests.yml index 3cae9f399b..a88003053f 100644 --- a/ansible/system_roles/nsqlookupd/tasks/tests.yml +++ b/ansible/system_roles/nsqlookupd/tasks/tests.yml @@ -3,7 +3,7 @@ - name: check if nsqloopupd running command: pgrep -x nsqlookupd -c failed_when: "False" - changed_when: "False" + changed_when: false register: nsqlookupd_running check_mode: "False" @@ -18,7 +18,7 @@ uri: url: http://127.0.0.1:4161/ping register: nsqlookupd_ping - changed_when: "False" + changed_when: false failed_when: "False" check_mode: "False" @@ -35,7 +35,7 @@ url: "http://127.0.0.1:8500/v1/health/service/nsqlookupd" return_content: "True" register: consul_req - changed_when: "False" + changed_when: false check_mode: "False" - name: fail if no nsqlookupd found @@ -51,7 +51,7 @@ url: "http://127.0.0.1:8500/v1/health/service/nsqlookupdhttp" return_content: "True" register: consul_req - changed_when: "False" + changed_when: false check_mode: "False" - name: fail if no nsqlookupdhttp found diff --git a/ansible/system_roles/postgres/tasks/main.yml b/ansible/system_roles/postgres/tasks/main.yml index c401501c70..cd19aad90f 100755 --- a/ansible/system_roles/postgres/tasks/main.yml +++ b/ansible/system_roles/postgres/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: search for postgres master - changed_when: "False" + changed_when: false add_host: name: "{{ inventory_hostname }}" groups: svc-postgres-master @@ -11,7 +11,7 @@ - config - name: set postgres master fact - changed_when: "False" + changed_when: false set_fact: postgres_master: "{{ postgres_listen_address }}" postgres_master_node: "{{ groups['svc-postgres-master'][0] }}" diff --git a/ansible/system_roles/postgres/tasks/tests.yml b/ansible/system_roles/postgres/tasks/tests.yml index e0d74b24c9..7877067bd6 100644 --- a/ansible/system_roles/postgres/tasks/tests.yml +++ b/ansible/system_roles/postgres/tasks/tests.yml @@ -3,7 +3,7 @@ - name: check if postgres running command: pgrep -f postgres -c failed_when: "False" - changed_when: "False" + changed_when: false register: postgres_running check_mode: "False" @@ -19,7 +19,7 @@ url: "http://127.0.0.1:8500/v1/health/service/postgres" return_content: "True" register: consul_req - changed_when: "False" + changed_when: false check_mode: "False" - name: fail if no postgres found -- GitLab