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
This commit is contained in:
caoyuan 2017-11-15 22:42:20 +08:00 committed by confi-surya
parent 2d18b63ef9
commit 471985dc2c
12 changed files with 17 additions and 17 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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 }}"

View File

@ -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:

View File

@ -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

View File

@ -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:

View File

@ -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] }}"

View File

@ -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]

View File

@ -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

View File

@ -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

View File

@ -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