From 471985dc2cce881ced74a5576a500bd3d38d5e8b Mon Sep 17 00:00:00 2001
From: caoyuan <cao.yuan@99cloud.net>
Date: Wed, 15 Nov 2017 22:42:20 +0800
Subject: [PATCH] Update usage of "|" to "is"
With the more recent versions of ansible, we should now use
"is" instead of the "|"
This should update it.
Change-Id: I6fba56fca182349972e8b0ee5452b37aa4090e0c
---
ansible/roles/blazar/tasks/bootstrap.yml | 2 +-
ansible/roles/glance/tasks/check.yml | 2 +-
ansible/roles/keystone/tasks/init_fernet.yml | 2 +-
ansible/roles/kibana/tasks/pull.yml | 2 +-
ansible/roles/mariadb/handlers/main.yml | 6 +++---
ansible/roles/mariadb/tasks/check.yml | 2 +-
ansible/roles/mariadb/tasks/recover_cluster.yml | 4 ++--
ansible/roles/murano/tasks/import_library_packages.yml | 2 +-
ansible/roles/nova/handlers/main.yml | 2 +-
ansible/roles/nova/tasks/simple_cell_setup.yml | 6 +++---
ansible/roles/openvswitch/handlers/main.yml | 2 +-
ansible/roles/ovs-dpdk/handlers/main.yml | 2 +-
12 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/ansible/roles/blazar/tasks/bootstrap.yml b/ansible/roles/blazar/tasks/bootstrap.yml
index 358f190538..999e888a48 100644
--- a/ansible/roles/blazar/tasks/bootstrap.yml
+++ b/ansible/roles/blazar/tasks/bootstrap.yml
@@ -43,7 +43,7 @@
--os-user-domain-name default
aggregate create {{ blazar_aggregate_pool_name }}
register: blazar_host_aggregate
- changed_when: blazar_host_aggregate | success
+ changed_when: blazar_host_aggregate is success
failed_when:
- blazar_host_aggregate.rc != 0
- blazar_host_aggregate.stderr.find('already') == -1
diff --git a/ansible/roles/glance/tasks/check.yml b/ansible/roles/glance/tasks/check.yml
index 1868ecfa31..6dccb2b99a 100644
--- a/ansible/roles/glance/tasks/check.yml
+++ b/ansible/roles/glance/tasks/check.yml
@@ -12,7 +12,7 @@
register: img_create
retries: 10
delay: 3
- until: img_create | success
+ until: img_create is success
when: kolla_enable_sanity_glance | bool
- name: Glance sanity check - cleanup
diff --git a/ansible/roles/keystone/tasks/init_fernet.yml b/ansible/roles/keystone/tasks/init_fernet.yml
index 8e9ecbb472..8c496288a3 100644
--- a/ansible/roles/keystone/tasks/init_fernet.yml
+++ b/ansible/roles/keystone/tasks/init_fernet.yml
@@ -5,7 +5,7 @@
port: "{{ keystone_ssh_port }}"
connect_timeout: 1
register: check_keystone_ssh_port
- until: check_keystone_ssh_port | success
+ until: check_keystone_ssh_port is success
retries: 10
delay: 5
diff --git a/ansible/roles/kibana/tasks/pull.yml b/ansible/roles/kibana/tasks/pull.yml
index af22338414..5a485214c8 100644
--- a/ansible/roles/kibana/tasks/pull.yml
+++ b/ansible/roles/kibana/tasks/pull.yml
@@ -7,5 +7,5 @@
image: "{{ item.value.image }}"
when:
- inventory_hostname in groups[item.value.group]
- - item.value.enabled | bool
+ - item.value.enabled is bool
with_dict: "{{ kibana_services }}"
diff --git a/ansible/roles/mariadb/handlers/main.yml b/ansible/roles/mariadb/handlers/main.yml
index abdbe926fa..d2b16b5aec 100644
--- a/ansible/roles/mariadb/handlers/main.yml
+++ b/ansible/roles/mariadb/handlers/main.yml
@@ -36,7 +36,7 @@
timeout: 60
search_regex: "MariaDB"
register: check_mariadb_port
- until: check_mariadb_port | success
+ until: check_mariadb_port is success
retries: 10
delay: 6
when:
@@ -79,7 +79,7 @@
timeout: 60
search_regex: "MariaDB"
register: check_mariadb_port
- until: check_mariadb_port | success
+ until: check_mariadb_port is success
retries: 10
delay: 6
when:
@@ -122,7 +122,7 @@
timeout: 60
search_regex: "MariaDB"
register: check_mariadb_port
- until: check_mariadb_port | success
+ until: check_mariadb_port is success
retries: 10
delay: 6
when:
diff --git a/ansible/roles/mariadb/tasks/check.yml b/ansible/roles/mariadb/tasks/check.yml
index 5389e78aef..be61942ce3 100644
--- a/ansible/roles/mariadb/tasks/check.yml
+++ b/ansible/roles/mariadb/tasks/check.yml
@@ -2,7 +2,7 @@
- name: Waiting for MariaDB service to be ready through VIP
command: "docker exec mariadb mysql -h {{ kolla_internal_fqdn }} -P {{ mariadb_port }} -u haproxy -e 'show databases;'"
register: result
- until: result | success
+ until: result is success
changed_when: False
retries: 6
delay: 10
diff --git a/ansible/roles/mariadb/tasks/recover_cluster.yml b/ansible/roles/mariadb/tasks/recover_cluster.yml
index 0dab90007b..52847ad630 100644
--- a/ansible/roles/mariadb/tasks/recover_cluster.yml
+++ b/ansible/roles/mariadb/tasks/recover_cluster.yml
@@ -137,7 +137,7 @@
timeout: 60
search_regex: "MariaDB"
register: check_mariadb_port
- until: check_mariadb_port | success
+ until: check_mariadb_port is success
retries: 10
delay: 6
when:
@@ -177,7 +177,7 @@
timeout: 60
search_regex: "MariaDB"
register: check_mariadb_port
- until: check_mariadb_port | success
+ until: check_mariadb_port is success
retries: 10
delay: 6
when:
diff --git a/ansible/roles/murano/tasks/import_library_packages.yml b/ansible/roles/murano/tasks/import_library_packages.yml
index 7579c05300..9666d29f41 100644
--- a/ansible/roles/murano/tasks/import_library_packages.yml
+++ b/ansible/roles/murano/tasks/import_library_packages.yml
@@ -7,7 +7,7 @@
timeout: 60
run_once: True
register: check_murano_port
- until: check_murano_port | success
+ until: check_murano_port is success
retries: 10
delay: 6
delegate_to: "{{ groups['murano-api'][0] }}"
diff --git a/ansible/roles/nova/handlers/main.yml b/ansible/roles/nova/handlers/main.yml
index 079c253d72..747fbe1d3f 100644
--- a/ansible/roles/nova/handlers/main.yml
+++ b/ansible/roles/nova/handlers/main.yml
@@ -43,7 +43,7 @@
# NOTE(Jeffrey4l): retry 5 to remove nova_libvirt container because when
# guests running, nova_libvirt will raise error even though it is removed.
retries: 5
- until: restart_nova_libvirt | success
+ until: restart_nova_libvirt is success
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
diff --git a/ansible/roles/nova/tasks/simple_cell_setup.yml b/ansible/roles/nova/tasks/simple_cell_setup.yml
index f5d393095c..4c82cc7689 100644
--- a/ansible/roles/nova/tasks/simple_cell_setup.yml
+++ b/ansible/roles/nova/tasks/simple_cell_setup.yml
@@ -4,7 +4,7 @@
docker exec nova_api nova-manage cell_v2 map_cell0
register: map_cell0
changed_when:
- - map_cell0 | success
+ - map_cell0 is success
- '"Cell0 is already setup" not in map_cell0.stdout'
failed_when:
- map_cell0.rc != 0
@@ -19,7 +19,7 @@
docker exec nova_api nova-manage cell_v2 create_cell
register: base_cell
changed_when:
- - base_cell | success
+ - base_cell is success
failed_when:
- base_cell.rc != 0
- '"already exists" not in base_cell.stdout'
@@ -45,7 +45,7 @@
retries: 20
delay: 10
until:
- - nova_compute_services | success
+ - nova_compute_services is success
- nova_compute_services.stdout | from_json | length != 0
- name: Discovering nova hosts
diff --git a/ansible/roles/openvswitch/handlers/main.yml b/ansible/roles/openvswitch/handlers/main.yml
index aebafb4185..5fe102c270 100644
--- a/ansible/roles/openvswitch/handlers/main.yml
+++ b/ansible/roles/openvswitch/handlers/main.yml
@@ -27,7 +27,7 @@
- name: Waiting for openvswitch_db service to be ready
command: docker exec openvswitch_db ovs-vsctl --no-wait show
register: check_result
- until: check_result | success
+ until: check_result is success
changed_when: False
retries: 30
delay: 2
diff --git a/ansible/roles/ovs-dpdk/handlers/main.yml b/ansible/roles/ovs-dpdk/handlers/main.yml
index 8c92ddbed8..696355067f 100644
--- a/ansible/roles/ovs-dpdk/handlers/main.yml
+++ b/ansible/roles/ovs-dpdk/handlers/main.yml
@@ -33,7 +33,7 @@
service: "{{ ovsdpdk_services[service_name] }}"
command: docker exec "{{ service.container_name }}" ovs-vsctl --no-wait show
register: check_result
- until: check_result | success
+ until: check_result is success
changed_when: False
retries: 30
delay: 2
--
GitLab