Initial support for EL7.

Changed 'service oracleasm <command> to '/etc/init.d/oracleasm' in orahost-storage/tasks/main.yml'

Author: oravirt

roles/orahost-storage/tasks/main.yml

@@ -35,12 +35,12 @@
     tags: asmlib
 
   - name: ASMlib | Rescan ASM disks
-    shell: service oracleasm scandisks
+    shell: /etc/init.d/oracleasm scandisks
     when: device_persistence == 'asmlib'
     tags: asmlib
 
   - name: ASMlib | List ASM disks
-    shell: service oracleasm listdisks
+    shell: /etc/init.d/oracleasm listdisks
     when: device_persistence == 'asmlib'
     register: listdisks
     tags: asmlib

roles/orahost/defaults/main.yml

@@ -50,6 +50,7 @@
   asmlib_rpm: "{% if ansible_distribution_major_version|int==6%}{{asmlib_rpm_el6}}{%elif ansible_distribution_major_version|int==7 %}{{asmlib_rpm_el7}}{% else %}None{% endif %}"
   asmlib_rpm_el6: "http://download.oracle.com/otn_software/asmlib/oracleasmlib-2.0.4-1.el6.x86_64.rpm"
   asmlib_rpm_el7: "http://download.oracle.com/otn_software/asmlib/oracleasmlib-2.0.12-1.el7.x86_64.rpm"
+  asmlib_rpm_sles: "http://oss.oracle.com/projects/oracleasm-support/dist/files/RPMS/sles12/amd64/2.1.8/oracleasm-support-2.1.8-1.SLE12.x86_64.rpm"
   #ol6_repo_file: public-yum-ol6.repo
   repo_dir: /etc/yum.repos.d/
 
@@ -202,7 +203,7 @@
   oracle_asm_packages_sles:
       - oracleasm-kmp-default
       - oracleasm-kmp-xen
-      - oracleasm-support
+      - "{{ asmlib_rpm_sles }}"
 
 
 

roles/orahost/tasks/Suse-12.yml

@@ -0,0 +1,3 @@
+- name: Disable Transparent Hugepages (runtime)
+  shell: if test -f /sys/kernel/mm/transparent_hugepage/enabled; then echo never > /sys/kernel/mm/transparent_hugepage/enabled; fi;
+  tags: tphnuma

roles/orahost/tasks/main.yml

@@ -253,36 +253,9 @@
     when: ansible_os_family == 'Suse'
     tags: seclimit
 
-  - name: Count number of kernel lines that needs to be changed (numa=off transparent_hugepage=never)
-    shell: cat /etc/grub.conf | grep title |wc -l
-    register: count
-    tags: thpnuma
-
-  - name: Disable Transparent Hugepages (in grub.conf)
-    lineinfile: dest=/etc/grub.conf
-              backup=True
-              backrefs=True
-              state=present
-              regexp='(^\s+kernel(\s+(?!transparent_hugepage=never)[\w=/\-\.]+)*)\s*$'
-              line='\1 transparent_hugepage=never'
-    with_sequence: start=0 end={{ count.stdout }}
-    when: ansible_os_family == 'RedHat'
-    tags: thpnuma
-
-  - name: Disable Numa (in grub.conf)
-    lineinfile: dest=/etc/grub.conf
-              backup=True
-              backrefs=True
-              state=present
-              regexp='(^\s+kernel(\s+(?!numa=off)[\w=/\-\.]+)*)\s*$'
-              line='\1 numa=off'
-    with_sequence: start=0 end={{ count.stdout }}
-    tags: thpnuma
-    when: disable_numa_boot and ansible_os_family == 'RedHat'
-
-  - name: Disable Transparent Hugepages (runtime)
-    shell: if test -f /sys/kernel/mm/transparent_hugepage/enabled; then echo never > /sys/kernel/mm/transparent_hugepage/enabled; fi;
-    tags: tphnuma
+  - include: "{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml"
+    #when: ansible_os_family == 'RedHat'
+
 
   - name: Network | Setup ip-address for RAC Interconnect
     template: src=ifcfg-eth1.j2 dest=/etc/sysconfig/network-scripts/ifcfg-eth1 owner=root mode=0644