A bit of refactoring

Author: oravirt

oraswdb-install/tasks/main.yml

@@ -81,7 +81,7 @@
     with_items: oracle_sw_image_db
     sudo: yes
     sudo_user: "{{ oracle_user }}"
-    when: master_node and not is_sw_source_local and oracle_sw_copy|bool #and {{ item.download }} == True
+    when: master_node and not is_sw_source_local and oracle_sw_copy|bool 
     tags:
       - oradbsw
 
@@ -90,7 +90,7 @@
     with_items: oracle_sw_image_db
     sudo: yes
     sudo_user: "{{ oracle_user }}"
-    when: master_node and is_sw_source_local and oracle_sw_copy|bool #and {{ item.download }} == True
+    when: master_node and is_sw_source_local and oracle_sw_copy|bool 
     tags:
       - oradbsw
 
@@ -99,7 +99,7 @@
     with_items: oracle_sw_image_db
     sudo: yes
     sudo_user: "{{ oracle_user }}"
-    when: master_node and oracle_sw_copy|bool and oracle_sw_unpack|bool #and {{ item.download }} == True
+    when: master_node and oracle_sw_copy|bool and oracle_sw_unpack|bool 
     tags:
       - oradbswunpack
 
@@ -108,7 +108,7 @@
     with_items: oracle_sw_image_db
     sudo: yes
     sudo_user: "{{ oracle_user }}"
-    when: master_node and not oracle_sw_copy|bool and oracle_sw_unpack|bool #and {{ item.download }} == True
+    when: master_node and not oracle_sw_copy|bool and oracle_sw_unpack|bool 
     tags:
       - oradbswunpack
 

oraswgi-install/defaults/main.yml

@@ -7,9 +7,10 @@
   hostgroup_leaf: "{{ hostgroup }}-leaf"
 
   oracle_user: oracle                        # User that will own the Oracle Installations.
-  grid_user: "{% if role_separation==true %}grid{% else %}oracle{% endif %}" 
+  grid_user: grid
+  grid_install_user: "{% if role_separation==true %}{{ grid_user }}{% else %}{{ oracle_user }}{% endif %}" 
   oracle_user_home: "/home/{{ oracle_user }}" # Home directory for oracle_user. Needed for passing in ssh-keys, profiles etc
-  grid_user_home: "/home/{{ grid_user }}" # Home directory for oracle_user. Needed for passing in ssh-keys, profiles etc
+  grid_user_home: "/home/{{ grid_install_user }}" # Home directory for oracle_user. Needed for passing in ssh-keys, profiles etc
   oracle_group: oinstall                          # Primary group for oracle_user. 
   oper_group: oper
   dba_group: dba                          # Primary group for oracle_user.