Various changes

Author: oravirt

orahost/tasks/main.yml

@@ -147,10 +147,18 @@
      - sshkeys
 
   - name: filesystem | Create partition and pv
-    script: disks.sh {{ item.value.device }}
+    shell:  parted -a optimal {{ item.value.device }} "mklabel gpt mkpart primary 1 -1"; pvcreate {{ item.value.pvname }}
+    args:
+     creates: "{{ item.value.pvname }}"
     with_dict: host_fs_layout
     when: configure_host_disks
     tags: hostfs
+
+#  - name: filesystem | Create partition and pv
+#    script: disks.sh {{ item.value.device }}
+#    with_dict: host_fs_layout
+#    when: configure_host_disks
+#    tags: hostf
 
   - name: filesystem | Create vg
     lvg: vg={{ item.value.vgname }} pvs={{ item.value.pvname }} state=present vg_options="-f" # "-f used as workaround for https://github.com/ansible/ansible/pull/6859"

oraswdb-install/defaults/main.yml

@@ -45,10 +45,9 @@
   oracle_sw_image_db: 
        - { filename: linuxamd64_12102_database_1of2.zip, version: 12.1.0.2 }
        - { filename: linuxamd64_12102_database_2of2.zip, version: 12.1.0.2 }
-#       - { filename: linuxamd64_12c_database_1of2.zip, version: 12.1.0.1 }
-#       - { filename: linuxamd64_12c_database_2of2.zip, version: 12.1.0.1 }
-#       - { filename: p13390677_112040_Linux-x86-64_1of7.zip, version: 11.2.0.4 }
-#       - { filename: p13390677_112040_Linux-x86-64_2of7.zip, version: 11.2.0.4 }
-#       - { filename: p10404530_112030_Linux-x86-64_1of7.zip, version: 11.2.0.3 }
-#       - { filename: p10404530_112030_Linux-x86-64_2of7.zip, version: 11.2.0.3 }
-#
+       - { filename: linuxamd64_12c_database_1of2.zip, version: 12.1.0.1 }
+       - { filename: linuxamd64_12c_database_2of2.zip, version: 12.1.0.1 }
+       - { filename: p13390677_112040_Linux-x86-64_1of7.zip, version: 11.2.0.4 }
+       - { filename: p13390677_112040_Linux-x86-64_2of7.zip, version: 11.2.0.4 }
+       - { filename: p10404530_112030_Linux-x86-64_1of7.zip, version: 11.2.0.3 }
+       - { filename: p10404530_112030_Linux-x86-64_2of7.zip, version: 11.2.0.3 }

oraswdb-install/tasks/main.yml

@@ -13,13 +13,6 @@
     tags:
       - nfsmountdb
 
-
-#  - debug: var=checkdbswinstall.stdout
-#    with_items: checkdbswinstall.results
-#    when: master_node
-#    tags:
-#     - checkifdbinstall
-
   - name: Add new dotprofile (DB)
     template: src=dotprofile-db.j2 dest={{ oracle_user_home }}/{{oracle_profile_name }} owner={{ oracle_user }} group={{ oracle_group }} mode=775 backup=yes
     with_items: oracle_databases
@@ -77,38 +70,46 @@
       - directoriesdb
 
   - name: Transfer oracle installfiles to server (www)
-    get_url: url={{ oracle_sw_source_www }}/{{ item.filename }} dest={{ oracle_stage }} mode=775
-    with_items: oracle_sw_image_db
+    get_url: url={{ oracle_sw_source_www }}/{{ item[0].filename }} dest={{ oracle_stage }} mode=775
+    with_nested: 
+      - oracle_sw_image_db
+      - oracle_databases
     sudo: yes
     sudo_user: "{{ oracle_user }}"
-    when: master_node 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|bool 
     tags:
       - oradbsw
 
   - name: Transfer oracle installfiles to server (local)
-    copy: src={{ oracle_sw_source_local }}/{{ item.filename }} dest={{ oracle_stage }} mode=775
-    with_items: oracle_sw_image_db
+    copy: src={{ oracle_sw_source_local }}/{{ item[0].filename }} dest={{ oracle_stage }} mode=775
+    with_nested: 
+      - oracle_sw_image_db
+      - oracle_databases
     sudo: yes
     sudo_user: "{{ oracle_user }}"
-    when: master_node 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|bool 
     tags:
       - oradbsw
 
   - name: Extract files to stage-area
-    unarchive: src={{ oracle_stage }}/{{ item.filename }}  dest={{ oracle_stage }}/{{ item.version }} copy=no 
-    with_items: oracle_sw_image_db
+    unarchive: src={{ oracle_stage }}/{{ item[0].filename }}  dest={{ oracle_stage }}/{{ item[0].version }} copy=no 
+    with_nested: 
+      - oracle_sw_image_db
+      - oracle_databases
     sudo: yes
     sudo_user: "{{ oracle_user }}"
-    when: master_node 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|bool and oracle_sw_unpack|bool 
     tags:
       - oradbswunpack
 
   - name: Extract files to stage-area (from remote location)
-    unarchive: src={{ oracle_stage_remote }}/{{ item.filename }}  dest={{ oracle_stage }}/{{ item.version }} copy=no
-    with_items: oracle_sw_image_db
+    unarchive: src={{ oracle_stage }}/{{ item[0].filename }}  dest={{ oracle_stage }}/{{ item[0].version }} copy=no 
+    with_nested: 
+      - oracle_sw_image_db
+      - oracle_databases
     sudo: yes
     sudo_user: "{{ oracle_user }}"
-    when: master_node 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|bool and oracle_sw_unpack|bool 
     tags:
       - oradbswunpack
 
@@ -135,8 +136,6 @@
     tags:
       - responsefileswdb
 
-
-
   - name: Install Oracle Database Server
     #shell: "{{ oracle_stage_install }}/{{ item.0.oracle_version_db }}/database/runInstaller -responseFile {{ oracle_rsp_stage }}/{{ oracle_db_responsefile }} -ignorePrereq -ignoreSysPrereqs -silent -waitforcompletion"
     shell: "{{ oracle_rsp_stage }}/{{ oracle_db_run_install }}"

oraswgi-install/tasks/main.yml

@@ -62,7 +62,6 @@
       - directories
     when: checkgiinstall.stdout != "1" 
 
-
   - name: Copy oracle installfiles to server (GI) (web)
     get_url: url={{ oracle_sw_source_www }}/{{ item.filename }} dest={{ oracle_stage }} mode=775
     with_items:  oracle_sw_image_gi 
@@ -230,7 +229,6 @@
     tags:
      - olsnodes
 
-
   - name: Unmount nfs share with installation media
     mount: src="{{ nfs_server_sw }}:{{ nfs_server_sw_path }}" name={{ oracle_stage_remote }} fstype=nfs state=absent
     tags:

oraswgi-install/templates/dotprofile-gi.j2

@@ -38,7 +38,7 @@ export PATH=$ORACLE_HOME/bin:$ORACLE_HOME/OPatch:$PATH:$SQLPATH:$GG_HOME/
         alias rman='rlwrap rman'
         alias sid='. oraenv'
         alias sqlp='. oraenv; sqlplus'
-        alias sqlsys='. oraenv ;rlwrap sqlplus "/ as sysdba"'
+        alias sqlsys='. oraenv ;rlwrap sqlplus "/ as sysasm"'
         #alias sqlsys='. oraenv ;rlwrap -D2 -irc -b'\''"@(){}[],+=&^%#;|\'\'' -f ~/.Scripts/tanel/tpt_public_unixmac/setup/wordfile_11gR2.txt sqlplus "/ as sysdba"'
         alias dbh='cd $ORACLE_HOME'
         alias dbb='cd $ORACLE_BASE'