Initial support for EL7 (os-wise)

Author: oravirt

roles/common/defaults/main.yml

@@ -1,16 +1,21 @@
 # Lab playbook - sets up the host specific shit
 ---
-  epel_rpm: "http://download.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm"
+
+  epel_rpm: "{% if ansible_distribution_major_version|int==6%}{{ epel6_rpm }}{%elif ansible_distribution_major_version|int==7 %}{{ epel7_rpm }}{% else %}None{% endif %}"
+  epel7_rpm: http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-8.noarch.rpm
+  epel6_rpm: http://download.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm
+  ol_repo_file: "{% if ansible_distribution_major_version|int==6%}{{ ol6_repo_file }}{%elif ansible_distribution_major_version|int==7 %}{{ ol7_repo_file }}{% else %}None{% endif %}"
   ol6_repo_file: public-yum-ol6.repo
+  ol7_repo_file: public-yum-ol7.repo
   repo_dir: /etc/yum.repos.d/
 #  default_user: ansible
   install_os_packages: true
   configure_epel_repo: true
   configure_public_yum_repo: true
   configure_motd: true
   configure_ntp: true
-
-  common_packages:
+  common_packages: "{% if ansible_distribution_major_version|int==6%}{{ common_packages_el6 }}{%elif ansible_distribution_major_version|int==7 %}{{ common_packages_el7 }}{% else %}None{% endif %}"
+  common_packages_el6:
       - screen
       - facter
       - procps
@@ -25,7 +30,6 @@
       - unzip
       - openssh-clients
       - compat-libcap1
-      - twm
       - collectl
       - rlwrap
       - tigervnc-server
@@ -39,6 +43,34 @@
       - python-devel
       - python-pip
       - libselinux-python
+      - twm
+  common_packages_el7:
+      - screen
+      - facter
+      - procps
+      - module-init-tools
+      - ethtool
+      - bc
+      - nc
+      - bind-utils
+      - nfs-utils
+      - make
+      - sysstat
+      - unzip
+      - openssh-clients
+      - compat-libcap1
+      - collectl
+      - rlwrap
+      - tigervnc-server
+      - ntp
+      - expect
+      - git
+      - lvm2
+      - xfsprogs
+      - btrfs-progs
+      - python-devel
+      - python-pip
+      - libselinux-python
 
   common_packages_sles:
       - screen

roles/common/tasks/main.yml

@@ -24,23 +24,23 @@
     tags:
      - epelrepo
 
-  - name: Get newest repo-file for OL6 (public-yum)
-    get_url: dest={{ repo_dir}}/{{ ol6_repo_file }}  url=http://public-yum.oracle.com/{{ ol6_repo_file }} backup=yes
-    when: configure_public_yum_repo and ansible_lsb.id == 'OracleServer' and ansible_lsb.major_release|int == 6
+  - name: Get newest repo-file for OL (public-yum)
+    get_url: dest={{ repo_dir}}/{{ ol_repo_file }}  url=http://public-yum.oracle.com/{{ ol_repo_file }} backup=yes
+    when: configure_public_yum_repo and ansible_distribution == 'OracleLinux'
     tags:
      - ol6repo
 
   - name: Install common packages OL/RHEL
     yum: name={{ item }} state=installed
-    with_items: "{{common_packages }}"
-    when: install_os_packages and ansible_pkg_mgr=="yum"
+    with_items: "{{ common_packages }}"
+    when: install_os_packages and ansible_os_family == 'RedHat'
     tags:
       - commonpackages
-   
+
   - name: Install common packages SLES12
     zypper: name={{ item }} state=installed
     with_items: "{{ common_packages_sles }}"
-    when: install_os_packages and ansible_pkg_mgr=="zypper" 
+    when: install_os_packages and ansible_os_family == 'Suse'
     tags:
       - commonpackages
 

roles/orahost/defaults/main.yml

@@ -23,6 +23,7 @@
   grid_users:
    - { username: grid, uid: 54320, primgroup: oinstall, othergroups: "asmadmin,asmdba,asmoper,dba", passwd: "$6$0xHoAXXF$K75HKb64Hcb/CEcr3YEj2LGERi/U2moJgsCK.ztGxLsKoaXc4UBiNZPL0hlxB5ng6GL.gyipfQOOXplzcdgvD0" }
 
+  firewall_service: "{% if ansible_distribution_major_version|int==6%}iptables{%elif ansible_distribution_major_version|int==7 %}firewalld{% else %}0{% endif %}"
   role_separation: false
   oracle_user: oracle                        # User that will own the Oracle Installations.
   grid_user: grid
@@ -44,9 +45,12 @@
    - /tmp/authorized_keys
   keyfile: /tmp/known_hosts
 
-  epel_rpm: "http://download.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm"
-  asmlib_rpm: "http://download.oracle.com/otn_software/asmlib/oracleasmlib-2.0.4-1.el6.x86_64.rpm"
-  ol6_repo_file: public-yum-ol6.repo
+
+  #epel_rpm: "http://download.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm"
+  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"
+  #ol6_repo_file: public-yum-ol6.repo
   repo_dir: /etc/yum.repos.d/
 
   disable_numa_boot: true                    # (true/false) Sets numa=off in grub.conf
@@ -62,7 +66,7 @@
   device_persistence: udev
   install_os_packages: true
   disable_selinux: true
-  disable_iptables: true
+  disable_firewall: true
 
   configure_hugepages: true
   configure_hugepages_by: percentage          # percentage/memory
@@ -139,7 +143,7 @@
       - sysstat
       - openssh-clients
       - compat-libcap1
-      - twm
+      #- twm
       - xorg-x11-xauth
       - xorg-x11-xinit
       - libXtst

roles/orahost/tasks/Redhat-6.yml

@@ -0,0 +1,31 @@
+---
+
+- 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 }}
+  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
+
+- 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/Redhat-7.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

@@ -23,18 +23,18 @@
   - name: Install packages required by Oracle for ASMlib on OL/RHEL
     yum: name={{ item }} state=installed
     with_items: "{{oracle_asm_packages}}"
-    when: install_os_packages and device_persistence == 'asmlib' and  ansible_os_family == 'RedHat'
+    when: install_os_packages and device_persistence == 'asmlib' and ansible_os_family == 'RedHat'
     tags: os_packages, oscheck
 
   - name: Install packages required by Oracle for ASMlib on SLES
     zypper: name={{ item }} state=installed
     with_items: "{{ oracle_asm_packages_sles }}"
-    when: install_os_packages and device_persistence == 'asmlib' and  ansible_os_family == 'Suse'
+    when: install_os_packages and device_persistence == 'asmlib' and ansible_os_family == 'Suse'
     tags: os_packages, oscheck, asm1
 
-  - name: Disable iptables
-    service: name=iptables state=stopped enabled=no
-    when: disable_iptables and ansible_os_family == 'RedHat'
+  - name: Disable firewall
+    service: name={{ firewall_service }} state=stopped enabled=no
+    when: disable_firewall and ansible_os_family == 'RedHat'
     tags: iptables
     register: iptables