aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmma Foley <efoley@redhat.com>2020-11-12 14:57:23 +0000
committerGerrit Code Review <gerrit@opnfv.org>2020-11-12 14:57:23 +0000
commit26a9cd755e8149c16a16ab9af5b54ca1893484fc (patch)
tree28302490ea573a08ec06a2362cfd3e6efbdfa5fe
parentdbec79bf7375ed213507daf1b5514df01e5b4fa0 (diff)
parent6bab7e8ab349393775524ae6fb4ecd8e74c28592 (diff)
Merge "[ansible] remove deprecated filters"
-rw-r--r--docker/ansible/roles/config_files/tasks/hugepages.yml2
-rw-r--r--docker/ansible/roles/config_files/tasks/ipmi.yml6
-rw-r--r--docker/ansible/roles/config_files/tasks/mcelog.yml6
-rw-r--r--docker/ansible/roles/config_files/tasks/rdt.yml2
-rw-r--r--docker/ansible/roles/config_files/tasks/virt.yml2
-rw-r--r--docker/ansible/roles/config_files/tasks/vswitch.yml4
6 files changed, 11 insertions, 11 deletions
diff --git a/docker/ansible/roles/config_files/tasks/hugepages.yml b/docker/ansible/roles/config_files/tasks/hugepages.yml
index bf49035c..43dca504 100644
--- a/docker/ansible/roles/config_files/tasks/hugepages.yml
+++ b/docker/ansible/roles/config_files/tasks/hugepages.yml
@@ -28,6 +28,6 @@
template:
src: hugepages.conf.j2
dest: "{{ config_file_dir }}//hugepages.conf"
- when: hugepages_result|succeeded
+ when: hugepages_result is succeeded
tags:
- hugepages
diff --git a/docker/ansible/roles/config_files/tasks/ipmi.yml b/docker/ansible/roles/config_files/tasks/ipmi.yml
index c7359fbf..558d5393 100644
--- a/docker/ansible/roles/config_files/tasks/ipmi.yml
+++ b/docker/ansible/roles/config_files/tasks/ipmi.yml
@@ -31,7 +31,7 @@
command: "modprobe ipmi_devintf"
register: ipmi_devintf
ignore_errors: true
- when: ipmi_devintf|failed and insert_ipmi_modules|default(false)|bool
+ when: (ipmi_devintf is failed) and (insert_ipmi_modules|default(false)|bool)
tags:
- ipmi
@@ -39,7 +39,7 @@
command: "modprobe ipmi_si"
register: ipmi_devsi
ignore_errors: true
- when: ipmi_devsi|failed and insert_ipmi_modules|default(false)|bool
+ when: (ipmi_devsi is failed) and (insert_ipmi_modules|default(false)|bool)
tags:
- ipmi
@@ -55,7 +55,7 @@
template:
src: ipmi.conf.j2
dest: "{{ config_file_dir }}/0_ipmi.conf"
- when: ipmi0_exists|succeeded and ipmi_devintf|succeeded and ipmi_devsi|succeeded
+ when: (ipmi0_exists is succeeded) and (ipmi_devintf is succeeded) and (ipmi_devsi is succeeded)
tags:
- ipmi
diff --git a/docker/ansible/roles/config_files/tasks/mcelog.yml b/docker/ansible/roles/config_files/tasks/mcelog.yml
index 49bbec93..ac14f80c 100644
--- a/docker/ansible/roles/config_files/tasks/mcelog.yml
+++ b/docker/ansible/roles/config_files/tasks/mcelog.yml
@@ -33,7 +33,7 @@
- name: build mcelog from sources if not in package
import_tasks: make_mcelog.yml
- when: mcelog_present|failed and install_mcelog|default(false)|bool
+ when: (mcelog_present is failed) and (install_mcelog|default(false)|bool)
tags:
- mcelogs
@@ -73,6 +73,6 @@
template:
src: mcelog.conf.j2
dest: "{{ config_file_dir }}/mcelog.conf"
- when: mcelog_running|succeeded and mcelog_exists|succeeded and mcelog_client_exists|succeeded
+ when: (mcelog_running is succeeded) and (mcelog_exists is succeeded) and (mcelog_client_exists is succeeded)
tags:
- - mcelogs
+ - mcelogs
diff --git a/docker/ansible/roles/config_files/tasks/rdt.yml b/docker/ansible/roles/config_files/tasks/rdt.yml
index cbfa7de5..bad67b78 100644
--- a/docker/ansible/roles/config_files/tasks/rdt.yml
+++ b/docker/ansible/roles/config_files/tasks/rdt.yml
@@ -32,7 +32,7 @@
template:
src: rdt.conf.j2
dest: "{{ config_file_dir }}/rdt.conf"
- when: rdt_result|succeeded and virt_file.stat.exists == False
+ when: (rdt_result is succeeded) and (virt_file.stat.exists == False)
tags:
- rdt
diff --git a/docker/ansible/roles/config_files/tasks/virt.yml b/docker/ansible/roles/config_files/tasks/virt.yml
index 9db10e8c..7fb0bb92 100644
--- a/docker/ansible/roles/config_files/tasks/virt.yml
+++ b/docker/ansible/roles/config_files/tasks/virt.yml
@@ -31,6 +31,6 @@
template:
src: virt.conf.j2
dest: "{{ config_file_dir }}/virt.conf"
- when: libvirt_result|succeeded and rdt_file.stat.exists == False
+ when: libvirt_result is succeeded and rdt_file.stat.exists == False
tags:
- virt
diff --git a/docker/ansible/roles/config_files/tasks/vswitch.yml b/docker/ansible/roles/config_files/tasks/vswitch.yml
index baffc4bd..c3028822 100644
--- a/docker/ansible/roles/config_files/tasks/vswitch.yml
+++ b/docker/ansible/roles/config_files/tasks/vswitch.yml
@@ -34,7 +34,7 @@
template:
src: "ovs_stats.conf.j2"
dest: "{{ config_file_dir }}/ovs_stats.conf"
- when: vswitchd_running|succeeded and dbsock_exists|succeeded
+ when: (vswitchd_running is succeeded) and (dbsock_exists is succeeded)
tags:
- ovs_stats
@@ -42,7 +42,7 @@
template:
src: "ovs_events.conf.j2"
dest: "{{ config_file_dir }}/ovs_events.conf"
- when: vswitchd_running|succeeded and dbsock_exists|succeeded
+ when: (vswitchd_running is succeeded) and (dbsock_exists is succeeded)
tags:
- ovs_events