Rhel7

pyazhpc/azinstall.py

@@ -46,7 +46,12 @@ def create_jumpbox_setup_script(tmpdir, sshprivkey, sshpubkey):
 else
     while ! rpm -q epel-release
     do
-        if ! sudo yum install -y epel-release > {logfile} 2>&1
+        if grep -q "Red Hat" /etc/redhat-release
+	then
+	    sudo systemctl stop firewalld.service
+	    sudo systemctl disable firewalld.service
+	    sudo yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm >> {logfile} 2>&1
+        elif ! sudo yum install -y epel-release > {logfile} 2>&1
         then
             sudo yum clean metadata
         fi

scripts/lfspkgs.sh

@@ -1,6 +1,22 @@
 #!/bin/bash
 
-yum -y install lustre kmod-lustre-osd-ldiskfs lustre-osd-ldiskfs-mount lustre-resource-agents e2fsprogs lustre-tests || exit 1
+# Use CentOS repo to install resource-agents (RHEL does not install them by default)
+if  grep -qF "Red Hat" /etc/redhat-release ; then
+    cat << EOF >> /etc/yum.repos.d/centos.repo
+[centos-7-base]
+name=CentOS-7 - Base
+mirrorlist=http://mirrorlist.centos.org/?release=7&arch=\$basearch&repo=os
+#baseurl='http://mirror.centos.org/centos/7/os/\$basearch/'
+enabled=1
+gpgcheck=1
+gpgkey=http://ftp.heanet.ie/pub/centos/7/os/x86_64/RPM-GPG-KEY-CentOS-7
+EOF
+    # Stop and disable the firewall for lnet to work
+    systemctl stop firewalld.service
+    systemctl disable firewalld.service
+fi
+
+yum -y install resource-agents dkms lustre kmod-lustre-osd-ldiskfs lustre-osd-ldiskfs-mount lustre-resource-agents e2fsprogs lustre-tests || exit 1
 
 sed -i 's/ResourceDisk\.Format=y/ResourceDisk.Format=n/g' /etc/waagent.conf
 
@@ -12,4 +28,6 @@ if [ -f "/etc/systemd/system/temp-disk-swapfile.service" ]; then
     systemctl stop temp-disk-swapfile.service
 fi
 
-umount /mnt/resource
+if [ -d /mnt/resource ]; then
+    umount /mnt/resource
+fi