- Simplified the way partitioning is done, no need for shellscripts anymore.

- Added partitionsuffix, based on OS version & whether or not dm-multipath is used

Author: oravirt

roles/oradb-create/tasks/main.yml

@@ -26,7 +26,7 @@
       - customdbcatemplate
 
   - name: Create responsefile for dbca
-    template: src=dbca-create-db.rsp.{{ item.0.oracle_version_db }}.j2 dest={{ oracle_rsp_stage }}/{{ oracle_dbca_rsp }}  owner={{ oracle_user }} group={{ oracle_group }} mode=644 backup=no
+    template: src=dbca-create-db.rsp.{{ item.0.oracle_version_db }}.j2 dest={{ oracle_rsp_stage }}/{{ oracle_dbca_rsp }}  owner={{ oracle_user }} group={{ oracle_group }} mode=600 backup=no
     #debug: var=msg
     with_together:
        - "{{oracle_databases}}"

roles/orahost-storage/defaults/main.yml

@@ -2,17 +2,19 @@
 
   multipath: none                   # dm-multipath (Linux device mapper multipath)
   device_persistence: asmlib
-  oracle_asm_disk_string: "{% if device_persistence == 'asmlib' %}{% elif device_persistence == 'udev' %}/dev/oracle/{% else %}{% endif %}"
+  oracle_asm_disk_string: "{% if device_persistence|lower == 'asmlib' %}{% elif device_persistence |lower == 'udev' %}/dev/oracle/{% else %}{% endif %}"
   oracle_stage: /u01/stage
   oracle_rsp_stage: "{{ oracle_stage }}/rsp"
   oracle_user: oracle
   grid_user: grid
-  grid_install_user: "{% if role_separation==true %}{{ grid_user }}{% else %}{{ oracle_user }}{% endif %}"
+  grid_install_user: "{% if role_separation %}{{ grid_user }}{% else %}{{ oracle_user }}{% endif %}"
   oracle_group: oinstall
   asmdba_group: asmdba
+  asmadmin_group: asmadmin
   dba_group: dba
   partition_devices: true
   use_partition_devices: true
+  partition_suffix: "{% if multipath |lower == 'dm-multipath' and ansible_distribution_major_version|int == 6  %}p1{% else %}1{% endif%}"
   asmlib_binary: "{% if ansible_distribution_major_version|int == 7 %}oracleasm{% elif ansible_distribution_major_version|int == 6  %}/etc/init.d/oracleasm{% else %}/etc/init.d/oracleasm{% endif%}"
 
 

roles/orahost-storage/tasks/asmlib.yml

@@ -1,25 +1,25 @@
 
-- name: ASMlib | Build script to create asmlib-labels
-  template: src=label-asm-disks.sh.j2 dest={{ oracle_rsp_stage }}/label-asm-disks-{{ item.diskgroup }}.sh mode=775
-  with_items: "{{asm_diskgroups}}"
-  when: master_node and device_persistence == 'asmlib' and asm_diskgroups is defined
-  tags: asmlibconfig,asmstorage
-
-- name: ASMlib | Run script to create asmlib-labels
-  shell: sh {{ oracle_rsp_stage }}/label-asm-disks-{{ item.diskgroup }}.sh
-  with_items: "{{asm_diskgroups}}"
+- name: ASM-storage | create asmlib labels
+  shell: "{{ asmlib_binary}} createdisk {{item.1.asmlabel}} {{ item.1.device }}{{ partition_suffix}}"
+  args:
+     creates: "/dev/oracleasm/disks/{{ item.1.asmlabel | upper}}"
+  with_subelements:
+      - "{{asm_diskgroups}}"
+      - disk
   when: master_node and device_persistence == 'asmlib' and asm_diskgroups is defined
   tags: asmlibconfig,asmstorage
 
 - name: ASMlib | Rescan ASM disks
   shell: "{{asmlib_binary}} scandisks"
   when: device_persistence == 'asmlib'
+  changed_when: False
   tags: asmlibconfig,asmstorage
 
 - name: ASMlib | List ASM disks
   shell: "{{asmlib_binary}} listdisks"
   when: device_persistence == 'asmlib'
   register: listdisks
+  changed_when: False
   tags: asmlibconfig,asmstorage
 
 - name: ASMlib | List ASM disks

roles/orahost-storage/tasks/dm-multipath-kpartx.yml

@@ -3,7 +3,7 @@
   - name: ASM-storage | run kpartx to add partition
     shell: kpartx -a {{ item.1.device}}
     args:
-     creates: "{{ item.1.device}}p1"
+     creates: "{{ item.1.device}}{{partition_suffix}}"
     with_subelements:
       - "{{asm_diskgroups}}"
       - disk

roles/orahost-storage/tasks/main.yml

@@ -1,22 +1,14 @@
 # Partition & ASM-Label Shared disks
----
-  - name: ASM-storage | Create device to label mappings for asm
-    template: src=asm-label-device-mapping.txt.j2 dest={{ oracle_rsp_stage }}/asm-label-device-mapping-{{ item.diskgroup }}.txt
-    with_items: "{{asm_diskgroups}}"
-    when: master_node and asm_diskgroups is defined
-    tags: asmstorage
 
-  - name: ASM-storage | Build script to create partitions
-    template: src=part-device.sh.j2 dest={{ oracle_rsp_stage }}/part-device-{{ item.diskgroup }}.sh mode=775
-    with_items: "{{asm_diskgroups}}"
-    when: master_node and asm_diskgroups is defined
-    tags: asmstorage
-
-  - name: ASM-storage | Run script to create partitions
-    shell: sh {{ oracle_rsp_stage }}/part-device-{{ item.diskgroup }}.sh
-    with_items: "{{asm_diskgroups}}"
+  - name: ASM-storage | partition devices
+    shell: parted {{ item.1.device }} "mklabel gpt mkpart primary 1 -1"
+    args:
+       creates: "{{ item.1.device}}{{partition_suffix}}"
+    with_subelements:
+        - "{{asm_diskgroups}}"
+        - disk
     when: master_node and partition_devices and asm_diskgroups is defined
-    tags: asmstorage
+    tags: asmstorage,partition
 
   - include: dm-multipath-kpartx.yml
     when: multipath == 'dm-multipath' and partition_devices and asm_diskgroups is defined

roles/orahost-storage/templates/asm-udev-rules.rules.j2

@@ -1,7 +1,7 @@
 {% for disk in asm_storage_layout[item] %}
 {% if use_partition_devices  %}
-KERNEL=="{{ disk.device.split("/")[-1]  }}1", NAME="{{oracle_asm_disk_string.split("/",2)[-1] }}{{ disk.asmlabel }}", OWNER="{{ grid_install_user }}", GROUP={% if role_separation==True %}"{{ asmdba_group }}"{% else %}"{{ dba_group }}"{% endif %}, MODE="0660"
+KERNEL=="{{ disk.device.split("/")[-1]  }}{{partition_suffix}}", NAME="{{oracle_asm_disk_string.split("/",2)[-1] }}{{ disk.asmlabel }}", OWNER="{{ grid_install_user }}", GROUP="{{ asmadmin_group }}", MODE="0660"
 {% elif not use_partition_devices  %}
-KERNEL=="{{ disk.device.split("/")[-1]  }}", NAME="{{oracle_asm_disk_string.split("/",2)[-1] }}{{ disk.asmlabel }}", OWNER="{{ grid_install_user }}", GROUP={% if role_separation==True %}"{{ asmdba_group }}"{% else %}"{{ dba_group }}"{% endif %}, MODE="0660"
+KERNEL=="{{ disk.device.split("/")[-1]  }}", NAME="{{oracle_asm_disk_string.split("/",2)[-1] }}{{ disk.asmlabel }}", OWNER="{{ grid_install_user }}", GROUP="{{ asmadmin_group }}", MODE="0660"
 {% endif %}
 {% endfor %}

roles/orahost-storage/templates/udev-label-device-mapping.txt.j2

@@ -1,4 +1,4 @@
 {% for disk in  item.disk    %}
-{{ disk.device }} {{oracle_asm_disk_string.split("/",2)[-1] }}{{ disk.asmlabel }} {{ grid_install_user }} {% if role_separation==True %}{{ asmdba_group }}{% else %}{{ dba_group }}{% endif %}
+{{ disk.device }} {{oracle_asm_disk_string.split("/",2)[-1] }}{{ disk.asmlabel }} {{ grid_install_user }} {{ asmadmin_group }}
 
 {% endfor %}