Skip to content

Commit 90f2106

Browse files
oravirtoravirt
committed
Removed '|bool' from conditionals
1 parent 7580083 commit 90f2106

File tree

8 files changed

+24
-24
lines changed

8 files changed

+24
-24
lines changed

‎roles/oraswdb-install/tasks/main.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
- name: Mount nfs share with installation media
1111
mount: src="{{ nfs_server_sw }}:{{ nfs_server_sw_path }}" name={{ oracle_stage_remote }} fstype=nfs state=mounted
12-
when: install_from_nfs|bool
12+
when: install_from_nfs
1313
tags:
1414
- nfsmountdb
1515

@@ -79,7 +79,7 @@
7979
- "{{oracle_databases}}"
8080
become: yes
8181
become_user: "{{ oracle_user }}"
82-
when: master_node and item[0].version == item[1].oracle_version_db and not is_sw_source_local and oracle_sw_copy|bool
82+
when: master_node and item[0].version == item[1].oracle_version_db and not is_sw_source_local and oracle_sw_copy
8383
tags:
8484
- oradbsw
8585

@@ -90,7 +90,7 @@
9090
- "{{oracle_databases}}"
9191
become: yes
9292
become_user: "{{ oracle_user }}"
93-
when: master_node and item[0].version == item[1].oracle_version_db and is_sw_source_local and oracle_sw_copy|bool
93+
when: master_node and item[0].version == item[1].oracle_version_db and is_sw_source_local and oracle_sw_copy
9494
tags:
9595
- oradbsw
9696

@@ -101,7 +101,7 @@
101101
- "{{oracle_databases}}"
102102
become: yes
103103
become_user: "{{ oracle_user }}"
104-
when: master_node and item[0].version == item[1].oracle_version_db and oracle_sw_copy|bool and oracle_sw_unpack|bool
104+
when: master_node and item[0].version == item[1].oracle_version_db and oracle_sw_copy and oracle_sw_unpack
105105
tags:
106106
- oradbswunpack
107107

@@ -112,7 +112,7 @@
112112
- "{{oracle_databases}}"
113113
become: yes
114114
become_user: "{{ oracle_user }}"
115-
when: master_node and item[0].version == item[1].oracle_version_db and not oracle_sw_copy|bool and oracle_sw_unpack|bool
115+
when: master_node and item[0].version == item[1].oracle_version_db and not oracle_sw_copy and oracle_sw_unpack
116116
tags:
117117
- oradbswunpack
118118

@@ -209,7 +209,7 @@
209209

210210
- name: Unmount nfs share with installation media
211211
mount: src="{{ nfs_server_sw }}:{{ nfs_server_sw_path }}" name={{ oracle_stage_remote }} fstype=nfs state=absent
212-
when: install_from_nfs|bool
212+
when: install_from_nfs
213213
tags:
214214
- nfsunmountdb
215215

‎roles/oraswgi-install/tasks/11.2.0.3.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
become_user: "{{ grid_install_user }}"
88
tags:
99
- oragridswunpack
10-
when: checkgiinstall.stdout != "1" and oracle_install_version_gi == item.version and oracle_sw_copy|bool and oracle_sw_unpack|bool
10+
when: checkgiinstall.stdout != "1" and oracle_install_version_gi == item.version and oracle_sw_copy and oracle_sw_unpack
1111

1212
- name: Extract files to stage-area (GI) (from remote location)
1313
unarchive: src={{ oracle_stage_remote }}/{{ item.filename }} dest={{ oracle_stage }}/{{ item.version }} copy=no
@@ -16,7 +16,7 @@
1616
become_user: "{{ grid_install_user }}"
1717
tags:
1818
- oragridswunpack
19-
when: checkgiinstall.stdout != "1" and oracle_install_version_gi == item.version and not oracle_sw_copy|bool and oracle_sw_unpack|bool
19+
when: checkgiinstall.stdout != "1" and oracle_install_version_gi == item.version and not oracle_sw_copy and oracle_sw_unpack
2020

2121
- name: Install cvuqdisk rpm
2222
yum: name="{{ oracle_stage_install }}/{{ oracle_install_version_gi }}/grid/rpm/{{ cvuqdisk_rpm }}" state=present

‎roles/oraswgi-install/tasks/11.2.0.4.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
become_user: "{{ grid_install_user }}"
88
tags:
99
- oragridswunpack
10-
when: checkgiinstall.stdout != "1" and oracle_install_version_gi == item.version and oracle_sw_copy|bool and oracle_sw_unpack|bool
10+
when: checkgiinstall.stdout != "1" and oracle_install_version_gi == item.version and oracle_sw_copy and oracle_sw_unpack
1111

1212
- name: Extract files to stage-area (GI) (from remote location)
1313
unarchive: src={{ oracle_stage_remote }}/{{ item.filename }} dest={{ oracle_stage }}/{{ item.version }} copy=no
@@ -16,7 +16,7 @@
1616
become_user: "{{ grid_install_user }}"
1717
tags:
1818
- oragridswunpack
19-
when: checkgiinstall.stdout != "1" and oracle_install_version_gi == item.version and not oracle_sw_copy|bool and oracle_sw_unpack|bool
19+
when: checkgiinstall.stdout != "1" and oracle_install_version_gi == item.version and not oracle_sw_copy and oracle_sw_unpack
2020

2121
- name: Install cvuqdisk rpm
2222
yum: name="{{ oracle_stage_install }}/{{ oracle_install_version_gi }}/grid/rpm/{{ cvuqdisk_rpm }}" state=present

‎roles/oraswgi-install/tasks/12.1.0.1.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
become_user: "{{ grid_install_user }}"
88
tags:
99
- oragridswunpack
10-
when: checkgiinstall.stdout != "1" and oracle_install_version_gi == item.version and oracle_sw_copy|bool and oracle_sw_unpack|bool
10+
when: checkgiinstall.stdout != "1" and oracle_install_version_gi == item.version and oracle_sw_copy and oracle_sw_unpack
1111

1212
- name: Extract files to stage-area (GI) (from remote location)
1313
unarchive: src={{ oracle_stage_remote }}/{{ item.filename }} dest={{ oracle_stage }}/{{ item.version }} copy=no
@@ -16,7 +16,7 @@
1616
become_user: "{{ grid_install_user }}"
1717
tags:
1818
- oragridswunpack
19-
when: checkgiinstall.stdout != "1" and oracle_install_version_gi == item.version and not oracle_sw_copy|bool and oracle_sw_unpack|bool
19+
when: checkgiinstall.stdout != "1" and oracle_install_version_gi == item.version and not oracle_sw_copy and oracle_sw_unpack
2020

2121
- name: Install cvuqdisk rpm
2222
yum: name="{{ oracle_stage_install }}/{{ oracle_install_version_gi }}/grid/rpm/{{ cvuqdisk_rpm }}" state=present

‎roles/oraswgi-install/tasks/12.1.0.2.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
become_user: "{{ grid_install_user }}"
88
tags:
99
- oragridswunpack
10-
when: checkgiinstall.stdout != "1" and oracle_install_version_gi == item.version and oracle_sw_copy|bool and oracle_sw_unpack|bool
10+
when: checkgiinstall.stdout != "1" and oracle_install_version_gi == item.version and oracle_sw_copy and oracle_sw_unpack
1111

1212
- name: Extract files to stage-area (GI) (from remote location)
1313
unarchive: src={{ oracle_stage_remote }}/{{ item.filename }} dest={{ oracle_stage }}/{{ item.version }} copy=no
@@ -16,7 +16,7 @@
1616
become_user: "{{ grid_install_user }}"
1717
tags:
1818
- oragridswunpack
19-
when: checkgiinstall.stdout != "1" and oracle_install_version_gi == item.version and not oracle_sw_copy|bool and oracle_sw_unpack|bool
19+
when: checkgiinstall.stdout != "1" and oracle_install_version_gi == item.version and not oracle_sw_copy and oracle_sw_unpack
2020

2121
- name: Install cvuqdisk rpm
2222
yum: name="{{ oracle_stage_install }}/{{ oracle_install_version_gi }}/grid/rpm/{{ cvuqdisk_rpm }}" state=present

‎roles/oraswgi-install/tasks/12.2.0.1.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
become_user: "{{ grid_install_user }}"
1010
tags:
1111
- oragridswunpack
12-
when: checkgiinstall.stdout != "1" and oracle_install_version_gi == item.version and oracle_sw_copy|bool and oracle_sw_unpack|bool
12+
when: checkgiinstall.stdout != "1" and oracle_install_version_gi == item.version and oracle_sw_copy and oracle_sw_unpack
1313

1414
- name: Extract files to ORACLE_HOME (gi) (from remote location)
1515
unarchive: src={{ oracle_stage_remote }}/{{ item.filename }} dest={{ oracle_home_gi }} copy=no

‎roles/oraswgi-install/tasks/main.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
mount: src="{{ nfs_server_sw }}:{{ nfs_server_sw_path }}" name={{ oracle_stage_remote }} fstype=nfs state=mounted
1111
tags:
1212
- nfsmountgi
13-
when: install_from_nfs|bool
13+
when: install_from_nfs
1414

1515
- name: Add new dotprofile (GI)
1616
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 @@
6969
become_user: "{{ grid_install_user }}"
7070
tags:
7171
- oragridsw
72-
when: checkgiinstall.stdout != "1" and not is_sw_source_local and oracle_install_version_gi == item.version and oracle_sw_copy|bool
72+
when: checkgiinstall.stdout != "1" and not is_sw_source_local and oracle_install_version_gi == item.version and oracle_sw_copy
7373

7474
- name: Copy oracle installfiles to server (GI) (local)
7575
copy: src={{ oracle_sw_source_local }}/{{ item.filename }} dest={{ oracle_stage }} mode=775
@@ -78,7 +78,7 @@
7878
become_user: "{{ grid_install_user }}"
7979
tags:
8080
- oragridsw
81-
when: checkgiinstall.stdout != "1" and is_sw_source_local and oracle_install_version_gi == item.version and oracle_sw_copy|bool
81+
when: checkgiinstall.stdout != "1" and is_sw_source_local and oracle_install_version_gi == item.version and oracle_sw_copy
8282

8383

8484
- include: "{{ oracle_install_version_gi }}.yml"
@@ -149,5 +149,5 @@
149149

150150
- name: Unmount nfs share with installation media
151151
mount: src="{{ nfs_server_sw }}:{{ nfs_server_sw_path }}" name={{ oracle_stage_remote }} fstype=nfs state=absent
152-
when: install_from_nfs|bool
152+
when: install_from_nfs
153153
tags: nfsunmountgi

‎roles/oraswgi-opatch/tasks/main.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
become: yes
4444
become_user: "{{ grid_install_user }}"
4545
with_items: "{{oracle_opatch_patch}}"
46-
when: oracle_psu_apply_gi and item.version == oracle_install_version_gi and oracle_sw_copy|bool and oracle_sw_unpack|bool
46+
when: oracle_psu_apply_gi and item.version == oracle_install_version_gi and oracle_sw_copy and oracle_sw_unpack
4747
tags:
4848
- oragridpatchunpack
4949

@@ -52,7 +52,7 @@
5252
with_items: "{{oracle_opatch_patch}}"
5353
become: yes
5454
become_user: "{{ grid_install_user }}"
55-
when: oracle_psu_apply_gi and item.version == oracle_install_version_gi and not oracle_sw_copy|bool and oracle_sw_unpack|bool
55+
when: oracle_psu_apply_gi and item.version == oracle_install_version_gi and not oracle_sw_copy and oracle_sw_unpack
5656
tags:
5757
- oragridpatchunpack
5858

@@ -64,7 +64,7 @@
6464
with_together:
6565
- "{{oracle_sw_image_gi_psu}}"
6666
- "{{gi_applied_patches.results}}"
67-
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
67+
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
6868
tags:
6969
- oragridpsuunpack
7070

@@ -75,7 +75,7 @@
7575
with_together:
7676
- "{{oracle_sw_image_gi_psu}}"
7777
- "{{gi_applied_patches.results}}"
78-
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
78+
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
7979
tags:
8080
- oragridpsuunpack
8181

@@ -89,7 +89,7 @@
8989
# become_user: "{{ grid_install_user }}"
9090
# tags:
9191
# - oragridswunpack
92-
# when: checkgiinstall.stdout != "1" and "{{ oracle_install_version_gi }}" == "{{ item.version }}" and not oracle_sw_copy|bool and oracle_sw_unpack|bool
92+
# when: checkgiinstall.stdout != "1" and "{{ oracle_install_version_gi }}" == "{{ item.version }}" and not oracle_sw_copy and oracle_sw_unpack
9393

9494
- name: Distribute latest opatch
9595
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

0 commit comments

Comments
 (0)