Merge "Fix usage of "|" for tests"

openstack · Jul 15, 2018 · 491a100 · 491a100
2 parents 8f2a9ec + 9186a60
commit 491a100
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 18 deletions.
diff --git a/playbooks/ceph-rgw-keystone-setup.yml b/playbooks/ceph-rgw-keystone-setup.yml
@@ -30,7 +30,7 @@
         insecure: "{{ keystone_service_adminuri_insecure }}"
       run_once: true
       register: add_service
-      until: add_service|success
+      until: add_service is success
       retries: 5
       delay: 2
       no_log: True
@@ -52,7 +52,7 @@
         insecure: "{{ keystone_service_adminuri_insecure }}"
       run_once: true
       register: add_user
-      until: add_user|success
+      until: add_user is success
       retries: 5
       delay: 10
       no_log: True
@@ -73,7 +73,7 @@
         insecure: "{{ keystone_service_adminuri_insecure }}"
       run_once: true
       register: add_admin_role
-      until: add_admin_role|success
+      until: add_admin_role is success
       retries: 5
       delay: 10
       no_log: True
@@ -92,7 +92,7 @@
         insecure: "{{ keystone_service_adminuri_insecure }}"
       run_once: true
       register: add_swiftoperator_role
-      until: add_swiftoperator_role|success
+      until: add_swiftoperator_role is success
       retries: 5
       delay: 10
       no_log: True
@@ -120,7 +120,7 @@
             interface: "internal"
       run_once: true
       register: add_endpoint
-      until: add_endpoint|success
+      until: add_endpoint is success
       retries: 5
       delay: 10
       no_log: True

diff --git a/playbooks/common-tasks/os-lxc-container-setup.yml b/playbooks/common-tasks/os-lxc-container-setup.yml
@@ -87,7 +87,7 @@
   changed_when: false
   delegate_to: "{{ physical_host }}"
   register: _lxc_container_state
-  until: _lxc_container_state | success
+  until: _lxc_container_state  is success
   retries: 3
   delay: 5
   when:
@@ -105,7 +105,7 @@
     --logpriority {{ (debug | bool) | ternary('DEBUG', 'INFO') }}
   delegate_to: "{{ physical_host }}"
   register: container_stop
-  until: container_stop | success
+  until: container_stop  is success
   retries: 3
   failed_when:
     - container_stop.rc not in [0, 2]
@@ -126,7 +126,7 @@
     --logpriority {{ (debug | bool) | ternary('DEBUG', 'INFO') }}
   delegate_to: "{{ physical_host }}"
   register: container_start
-  until: container_start | success
+  until: container_start  is success
   retries: 3
   when:
     - (_mc is defined and _mc | changed) or (_ec is defined and _ec | changed)

diff --git a/playbooks/common-tasks/os-nspawn-container-setup.yml b/playbooks/common-tasks/os-nspawn-container-setup.yml
@@ -109,12 +109,12 @@
     name: "systemd-nspawn@{{ systemd_escape.stdout }}"
     state: restarted
   register: _container_restart
-  until: _container_restart | success
+  until: _container_restart  is success
   retries: 3
   delay: 5
   delegate_to: "{{ physical_host }}"
   when:
-    - _ec | changed
+    - _ec  is changed
   tags:
     - common-nspawn
 
@@ -123,6 +123,6 @@
     delay: 3
     timeout: 60
   when:
-    - _container_restart | changed
+    - _container_restart  is changed
   tags:
     - common-nspawn
diff --git a/playbooks/os-cinder-install.yml b/playbooks/os-cinder-install.yml
@@ -215,4 +215,4 @@
         option: need_online_data_migrations
         value: False
       when:
-        - data_migrations | succeeded
+        - data_migrations  is succeeded
diff --git a/playbooks/os-nova-install.yml b/playbooks/os-nova-install.yml
@@ -205,4 +205,4 @@
         option: need_online_data_migrations
         value: False
       when:
-        - data_migrations | succeeded
+        - data_migrations  is succeeded
diff --git a/playbooks/utility-install.yml b/playbooks/utility-install.yml
@@ -73,7 +73,7 @@
           {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}
           {{ pip_install_options | default('') }}
       register: install_packages
-      until: install_packages|success
+      until: install_packages is success
       retries: 5
       delay: 2
 

diff --git a/tests/get-ansible-role-requirements.yml b/tests/get-ansible-role-requirements.yml
@@ -73,7 +73,7 @@
                        map(attribute='item') | list)
                       | default(required_roles, True) }}"
       register: git_clone
-      until: git_clone | success
+      until: git_clone  is success
       retries: "{{ git_clone_retries }}"
       delay: "{{ git_clone_retry_delay }}"
 

diff --git a/tests/roles/bootstrap-host/tasks/prepare_loopback_swap.yml b/tests/roles/bootstrap-host/tasks/prepare_loopback_swap.yml
@@ -24,7 +24,7 @@
 - name: Format the swap file
   command: mkswap /openstack/swap.img
   when:
-    - swap_create | changed
+    - swap_create  is changed
   tags:
     - swap-format
     - skip_ansible_lint

diff --git a/tests/roles/bootstrap-host/tasks/prepare_octavia.yml b/tests/roles/bootstrap-host/tasks/prepare_octavia.yml
@@ -20,7 +20,7 @@
     state: "present"
     update_cache: yes
   register: install_packages
-  until: install_packages|success
+  until: install_packages is success
   retries: 5
   delay: 2
   with_items:
@@ -42,7 +42,7 @@
     state: "present"
     extra_args: "-c {{ pip_install_upper_constraints_proto }}://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?id={{ requirements_git_install_branch | regex_replace(' #.*$','') }}"
   register: install_packages
-  until: install_packages|success
+  until: install_packages is success
   retries: 5
   delay: 2
   with_items: