Removed '|bool' from conditionals

oravirt · Apr 28, 2018 · 90f2106 · 90f2106
1 parent 7580083
commit 90f2106
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 24 deletions.
diff --git a/roles/oraswdb-install/tasks/main.yml b/roles/oraswdb-install/tasks/main.yml
@@ -9,7 +9,7 @@
 
   - name: Mount nfs share with installation media
     mount: src="{{ nfs_server_sw }}:{{ nfs_server_sw_path }}" name={{ oracle_stage_remote }} fstype=nfs state=mounted
-    when: install_from_nfs|bool
+    when: install_from_nfs
     tags:
       - nfsmountdb
 
@@ -79,7 +79,7 @@
       - "{{oracle_databases}}"
     become: yes
     become_user: "{{ oracle_user }}"
-    when: master_node and item[0].version == item[1].oracle_version_db and not is_sw_source_local and oracle_sw_copy|bool
+    when: master_node and item[0].version == item[1].oracle_version_db and not is_sw_source_local and oracle_sw_copy
     tags:
       - oradbsw
 
@@ -90,7 +90,7 @@
       - "{{oracle_databases}}"
     become: yes
     become_user: "{{ oracle_user }}"
-    when: master_node and item[0].version == item[1].oracle_version_db and is_sw_source_local and oracle_sw_copy|bool
+    when: master_node and item[0].version == item[1].oracle_version_db and is_sw_source_local and oracle_sw_copy
     tags:
       - oradbsw
 
@@ -101,7 +101,7 @@
       - "{{oracle_databases}}"
     become: yes
     become_user: "{{ oracle_user }}"
-    when: master_node and item[0].version == item[1].oracle_version_db and oracle_sw_copy|bool and oracle_sw_unpack|bool
+    when: master_node and item[0].version == item[1].oracle_version_db and oracle_sw_copy and oracle_sw_unpack
     tags:
       - oradbswunpack
 
@@ -112,7 +112,7 @@
       - "{{oracle_databases}}"
     become: yes
     become_user: "{{ oracle_user }}"
-    when: master_node and item[0].version == item[1].oracle_version_db and not oracle_sw_copy|bool and oracle_sw_unpack|bool
+    when: master_node and item[0].version == item[1].oracle_version_db and not oracle_sw_copy and oracle_sw_unpack
     tags:
       - oradbswunpack
 
@@ -209,7 +209,7 @@
 
   - name: Unmount nfs share with installation media
     mount: src="{{ nfs_server_sw }}:{{ nfs_server_sw_path }}" name={{ oracle_stage_remote }} fstype=nfs state=absent
-    when: install_from_nfs|bool
+    when: install_from_nfs
     tags:
       - nfsunmountdb
 

diff --git a/roles/oraswgi-install/tasks/11.2.0.3.yml b/roles/oraswgi-install/tasks/11.2.0.3.yml
@@ -7,7 +7,7 @@
   become_user: "{{ grid_install_user }}"
   tags:
     - oragridswunpack
-  when: checkgiinstall.stdout != "1" and oracle_install_version_gi  == item.version and oracle_sw_copy|bool and oracle_sw_unpack|bool
+  when: checkgiinstall.stdout != "1" and oracle_install_version_gi  == item.version and oracle_sw_copy and oracle_sw_unpack
 
 - name: Extract files to stage-area (GI) (from remote location)
   unarchive: src={{ oracle_stage_remote }}/{{ item.filename }}  dest={{ oracle_stage }}/{{ item.version }} copy=no
@@ -16,7 +16,7 @@
   become_user: "{{ grid_install_user }}"
   tags:
   - oragridswunpack
-  when: checkgiinstall.stdout != "1" and oracle_install_version_gi == item.version and not oracle_sw_copy|bool and oracle_sw_unpack|bool
+  when: checkgiinstall.stdout != "1" and oracle_install_version_gi == item.version and not oracle_sw_copy and oracle_sw_unpack
 
 - name: Install cvuqdisk rpm
   yum: name="{{ oracle_stage_install }}/{{ oracle_install_version_gi }}/grid/rpm/{{ cvuqdisk_rpm }}" state=present

diff --git a/roles/oraswgi-install/tasks/11.2.0.4.yml b/roles/oraswgi-install/tasks/11.2.0.4.yml
@@ -7,7 +7,7 @@
   become_user: "{{ grid_install_user }}"
   tags:
     - oragridswunpack
-  when: checkgiinstall.stdout != "1" and oracle_install_version_gi  == item.version and oracle_sw_copy|bool and oracle_sw_unpack|bool
+  when: checkgiinstall.stdout != "1" and oracle_install_version_gi  == item.version and oracle_sw_copy and oracle_sw_unpack
 
 - name: Extract files to stage-area (GI) (from remote location)
   unarchive: src={{ oracle_stage_remote }}/{{ item.filename }}  dest={{ oracle_stage }}/{{ item.version }} copy=no
@@ -16,7 +16,7 @@
   become_user: "{{ grid_install_user }}"
   tags:
   - oragridswunpack
-  when: checkgiinstall.stdout != "1" and oracle_install_version_gi == item.version and not oracle_sw_copy|bool and oracle_sw_unpack|bool
+  when: checkgiinstall.stdout != "1" and oracle_install_version_gi == item.version and not oracle_sw_copy and oracle_sw_unpack
 
 - name: Install cvuqdisk rpm
   yum: name="{{ oracle_stage_install }}/{{ oracle_install_version_gi }}/grid/rpm/{{ cvuqdisk_rpm }}" state=present

diff --git a/roles/oraswgi-install/tasks/12.1.0.1.yml b/roles/oraswgi-install/tasks/12.1.0.1.yml
@@ -7,7 +7,7 @@
   become_user: "{{ grid_install_user }}"
   tags:
     - oragridswunpack
-  when: checkgiinstall.stdout != "1" and oracle_install_version_gi == item.version and oracle_sw_copy|bool and oracle_sw_unpack|bool
+  when: checkgiinstall.stdout != "1" and oracle_install_version_gi == item.version and oracle_sw_copy and oracle_sw_unpack
 
 - name: Extract files to stage-area (GI) (from remote location)
   unarchive: src={{ oracle_stage_remote }}/{{ item.filename }}  dest={{ oracle_stage }}/{{ item.version }} copy=no
@@ -16,7 +16,7 @@
   become_user: "{{ grid_install_user }}"
   tags:
   - oragridswunpack
-  when: checkgiinstall.stdout != "1" and  oracle_install_version_gi == item.version and not oracle_sw_copy|bool and oracle_sw_unpack|bool
+  when: checkgiinstall.stdout != "1" and  oracle_install_version_gi == item.version and not oracle_sw_copy and oracle_sw_unpack
 
 - name: Install cvuqdisk rpm
   yum: name="{{ oracle_stage_install }}/{{ oracle_install_version_gi }}/grid/rpm/{{ cvuqdisk_rpm }}" state=present

diff --git a/roles/oraswgi-install/tasks/12.1.0.2.yml b/roles/oraswgi-install/tasks/12.1.0.2.yml
@@ -7,7 +7,7 @@
   become_user: "{{ grid_install_user }}"
   tags:
     - oragridswunpack
-  when: checkgiinstall.stdout != "1" and oracle_install_version_gi == item.version and oracle_sw_copy|bool and oracle_sw_unpack|bool
+  when: checkgiinstall.stdout != "1" and oracle_install_version_gi == item.version and oracle_sw_copy and oracle_sw_unpack
 
 - name: Extract files to stage-area (GI) (from remote location)
   unarchive: src={{ oracle_stage_remote }}/{{ item.filename }}  dest={{ oracle_stage }}/{{ item.version }} copy=no
@@ -16,7 +16,7 @@
   become_user: "{{ grid_install_user }}"
   tags:
   - oragridswunpack
-  when: checkgiinstall.stdout != "1" and oracle_install_version_gi == item.version and not oracle_sw_copy|bool and oracle_sw_unpack|bool
+  when: checkgiinstall.stdout != "1" and oracle_install_version_gi == item.version and not oracle_sw_copy and oracle_sw_unpack
 
 - name: Install cvuqdisk rpm
   yum: name="{{ oracle_stage_install }}/{{ oracle_install_version_gi }}/grid/rpm/{{ cvuqdisk_rpm }}" state=present

diff --git a/roles/oraswgi-install/tasks/12.2.0.1.yml b/roles/oraswgi-install/tasks/12.2.0.1.yml
@@ -9,7 +9,7 @@
     become_user: "{{ grid_install_user }}"
     tags:
       - oragridswunpack
-    when: checkgiinstall.stdout != "1" and oracle_install_version_gi == item.version and oracle_sw_copy|bool and oracle_sw_unpack|bool
+    when: checkgiinstall.stdout != "1" and oracle_install_version_gi == item.version and oracle_sw_copy and oracle_sw_unpack
 
   - name: Extract files to ORACLE_HOME (gi) (from remote location)
     unarchive: src={{ oracle_stage_remote }}/{{ item.filename }}  dest={{ oracle_home_gi }} copy=no

diff --git a/roles/oraswgi-install/tasks/main.yml b/roles/oraswgi-install/tasks/main.yml
@@ -10,7 +10,7 @@
     mount: src="{{ nfs_server_sw }}:{{ nfs_server_sw_path }}" name={{ oracle_stage_remote }} fstype=nfs state=mounted
     tags:
       - nfsmountgi
-    when: install_from_nfs|bool
+    when: install_from_nfs
 
   - name: Add new dotprofile (GI)
     template: src=dotprofile-gi.j2 dest={{ grid_user_home }}/{{ oracle_profile_name_gi }} owner={{ grid_install_user }} group={{ oracle_group }} mode=755 backup=yes
@@ -69,7 +69,7 @@
     become_user: "{{ grid_install_user }}"
     tags:
       - oragridsw
-    when: checkgiinstall.stdout != "1" and not is_sw_source_local and oracle_install_version_gi  == item.version and oracle_sw_copy|bool
+    when: checkgiinstall.stdout != "1" and not is_sw_source_local and oracle_install_version_gi  == item.version and oracle_sw_copy
 
   - name: Copy oracle installfiles to server (GI) (local)
     copy: src={{ oracle_sw_source_local }}/{{ item.filename }} dest={{ oracle_stage }} mode=775
@@ -78,7 +78,7 @@
     become_user: "{{ grid_install_user }}"
     tags:
       - oragridsw
-    when: checkgiinstall.stdout != "1" and is_sw_source_local and oracle_install_version_gi == item.version and oracle_sw_copy|bool
+    when: checkgiinstall.stdout != "1" and is_sw_source_local and oracle_install_version_gi == item.version and oracle_sw_copy
 
 
   - include: "{{ oracle_install_version_gi }}.yml"
@@ -149,5 +149,5 @@
 
   - name: Unmount nfs share with installation media
     mount: src="{{ nfs_server_sw }}:{{ nfs_server_sw_path }}" name={{ oracle_stage_remote }} fstype=nfs state=absent
-    when: install_from_nfs|bool
+    when: install_from_nfs
     tags: nfsunmountgi
diff --git a/roles/oraswgi-opatch/tasks/main.yml b/roles/oraswgi-opatch/tasks/main.yml
@@ -43,7 +43,7 @@
     become: yes
     become_user: "{{ grid_install_user }}"
     with_items: "{{oracle_opatch_patch}}"
-    when: oracle_psu_apply_gi and item.version == oracle_install_version_gi and oracle_sw_copy|bool and oracle_sw_unpack|bool
+    when: oracle_psu_apply_gi and item.version == oracle_install_version_gi and oracle_sw_copy and oracle_sw_unpack
     tags:
       - oragridpatchunpack
 
@@ -52,7 +52,7 @@
     with_items: "{{oracle_opatch_patch}}"
     become: yes
     become_user: "{{ grid_install_user }}"
-    when: oracle_psu_apply_gi and item.version == oracle_install_version_gi and not oracle_sw_copy|bool and oracle_sw_unpack|bool
+    when: oracle_psu_apply_gi and item.version == oracle_install_version_gi and not oracle_sw_copy and oracle_sw_unpack
     tags:
       - oragridpatchunpack
 
@@ -64,7 +64,7 @@
     with_together:
        - "{{oracle_sw_image_gi_psu}}"
        - "{{gi_applied_patches.results}}"
-    when: oracle_psu_apply_gi and item.0.version == oracle_install_version_gi and not item.1.stdout != 0 and oracle_sw_copy|bool and oracle_sw_unpack|bool
+    when: oracle_psu_apply_gi and item.0.version == oracle_install_version_gi and not item.1.stdout != 0 and oracle_sw_copy and oracle_sw_unpack
     tags:
       - oragridpsuunpack
 
@@ -75,7 +75,7 @@
     with_together:
        - "{{oracle_sw_image_gi_psu}}"
        - "{{gi_applied_patches.results}}"
-    when: oracle_psu_apply_gi and item.0.version == oracle_install_version_gi and not item.1.stdout != 0 and not oracle_sw_copy|bool and oracle_sw_unpack|bool
+    when: oracle_psu_apply_gi and item.0.version == oracle_install_version_gi and not item.1.stdout != 0 and not oracle_sw_copy and oracle_sw_unpack
     tags:
       - oragridpsuunpack
 
@@ -89,7 +89,7 @@
 #    become_user: "{{ grid_install_user }}"
 #    tags:
 #    - oragridswunpack
-#    when: checkgiinstall.stdout != "1" and "{{ oracle_install_version_gi }}" == "{{ item.version }}" and not oracle_sw_copy|bool and oracle_sw_unpack|bool
+#    when: checkgiinstall.stdout != "1" and "{{ oracle_install_version_gi }}" == "{{ item.version }}" and not oracle_sw_copy and oracle_sw_unpack
 
   - name: Distribute latest opatch
     shell: rm -rf {{ oracle_home_gi }}/OPatch; cp -Rvp {{ oracle_psu_stage }}/{{ oracle_install_version_gi }}/OPatch {{ oracle_home_gi }}; chown -R {{ grid_install_user }}:{{ oracle_group }} {{ oracle_home_gi }}/OPatch