Merge pull request #46 from clustervision/development

Development

configuration/common_functions.sh

@@ -184,7 +184,7 @@ function store_variable_backend {
         return 1
     else
         # delete the line if it exists, and append the new value
-        [[ -w "$1" ]] && sed -i '/^'"$2"'=/d' "$1"
+        [[ -w "$1" ]] && sed -i --follow-symlinks '/^'"$2"'=/d' "$1"
         line="${SH_RO_VAR+declare -r }${2}=${SYSTEM_VAR-\"}${3}${SYSTEM_VAR-\"}"
         append_line "$1" "$line"
     fi

configuration/configure.sh

@@ -145,7 +145,7 @@ function run_one_script {
             [[ -r /etc/trinity.sh ]] && source /etc/trinity.sh
             source \"$POST_CONFIG\"
             [[ -r /etc/trinity.sh ]] && source /etc/trinity.sh
-            [[ -r \"$TRIX_SHADOW\" ]] && source \"$TRIX_SHADOW\"
+            [[ -r \"\$TRIX_SHADOW\" ]] && source \"\$TRIX_SHADOW\"
             source \"$POST_SCRIPT\" "
 
         ret=$?

configuration/controller.cfg

@@ -51,6 +51,10 @@ POSTLIST=( \
             openldap \
             sssd \
             bind \
+            mariadb \
+            slurm-pre \
+            slurm \
+            applications \
          )
 
 

configuration/controller/additional-packages.sh

@@ -2,8 +2,6 @@
 
 # Setup for the additional package list
 
-source "$POST_CONFIG"
-
 systemctl enable haveged
 flag_is_unset CHROOT_INSTALL && systemctl restart haveged || true
 

configuration/controller/additional-repos.sh

@@ -6,8 +6,6 @@
 # of pulling them off of the internet, but again, there is no guarantee that the
 # controller has connectivity *during install*. It may have it later on.
 
-source "$POST_CONFIG"
-
 ret=0
 
 # Key files

configuration/controller/applications.pkglist

@@ -0,0 +1,9 @@
+infinipath-psm
+numactl
+librdmacm
+libpciaccess
+libibverbs
+libfabric
+libpcap
+libtool-ltdl
+libgfortran

configuration/controller/applications.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+#
+# Script to add provided application modules to the system
+# All modulefiles are located in separate directories usign the format
+#
+# POST_FILEDIR/GROUP/module/version/modulefile
+#
+# The script will copy all available modules to their appropriate location
+#
+# Modulefiles should assume that the application will be installed in:
+#
+# {{ prefix }}/applications/module/version
+# 
+# This script will replace {{ prefix }} with the correct value
+#
+
+for GROUP in 'CV-standard' 'CV-advanced' 'local'; do
+
+    echo_info "Adding $GROUP module files to the system"
+
+    for MOD in ${POST_FILEDIR}/${GROUP}/*; do
+
+        [[ -e "$MOD" ]] || continue;
+
+        MODULE=$(basename "$MOD");
+        VERSION=$(ls "${POST_FILEDIR}/${GROUP}/${MODULE}");
+        echo_info "Adding ${MODULE}/${VERSION} to $GROUP";
+
+        cp -r "$MOD" "${TRIX_SHARED}/modulefiles/${GROUP}/"
+        sed -i -e "s,{{ prefix }},$TRIX_SHARED," "${TRIX_SHARED}/modulefiles/${GROUP}/${MODULE}/${VERSION}/modulefile"
+
+    done
+
+done
+

configuration/controller/applications/CV-standard/openmpi/2.0.0/modulefile

@@ -0,0 +1,42 @@
+#%Module1.0
+#
+# @name: openmpi 
+# @version: 2.0.0
+
+
+# Customize the output of `module help` command
+# ---------------------------------------------
+proc ModulesHelp { } {
+    puts stderr "\tAdds openmpi to your environment variables"
+    puts stderr "\t\t\$PATH, \$MANPATH"
+}
+
+# Customize the output of `module whatis` command
+# -----------------------------------------------
+module-whatis "loads the [module-info name] environment"
+
+# Define internal modulefile variables (Tcl script use only)
+# ----------------------------------------------------------
+set name    openmpi
+set version 2.0.0
+set prefix  {{ prefix }}/applications/${name}/${version}
+
+# Check if the path exists before modifying environment
+# -----------------------------------------------------
+if {![file exists $prefix]} {
+    puts stderr "\t[module-info name] Load Error: $prefix does not exist"
+    break
+    exit 1
+}
+
+# Update common variables in the environment
+# ------------------------------------------
+prepend-path   PATH              $prefix/bin
+prepend-path   LD_LIBRARY_PATH   $prefix/lib
+prepend-path   LIBRARY_PATH      $prefix/lib
+prepend-path   INCLUDE           $prefix/include
+prepend-path   C_INCLUDE_PATH    $prefix/include
+prepend-path   MANPATH           $prefix/share/man
+
+setenv         OPAL_PREFIX       $prefix
+

configuration/controller/chrony.sh

@@ -1,10 +1,6 @@
 
 # Chrony (time server) configuration
 
-source "$POST_CONFIG"
-source /etc/trinity.sh
-
-
 display_var CHRONY_{UPSTREAM,SERVER} TRIX_CTRL{1,2}_HOSTNAME
 
 

configuration/controller/drbd-master.sh

@@ -1,9 +1,6 @@
 #!/bin/bash
 
 
-source "$POST_CONFIG"
-source /etc/trinity.sh
-
 function replace_template {
     [ $# -gt 3 -o $# -lt 2 ] && echo "Wrong numger of argument in replace_template." && exit 1
     if [ $# -eq 3 ]; then

configuration/controller/environment-modules.sh

@@ -2,10 +2,6 @@
 
 # Environment modules setup
 
-source /etc/trinity.sh
-source "$POST_CONFIG"
-
-
 if flag_is_unset CHROOT_INSTALL ; then
 
     echo_info 'Creating the shared modules directories'

configuration/controller/firewalld.sh

@@ -2,9 +2,6 @@
 
 # Basic configuration of firewalld, without TUI
 
-source "$POST_CONFIG"
-
-
 # So we want firewalld. Enable and start it now, otherwise lots of commands will
 # fail later.
 

configuration/controller/hosts.sh

@@ -5,11 +5,6 @@
 # because of multiple interfaces?). We have to do it ourselves or nothing will
 # resolve and lots o' stuff will break.
 
-source "$POST_CONFIG"
-
-
-#---------------------------------------
-
 # Display the variables that we will need
 
 display_var HA CTRL{1,2,}_{HOSTNAME,IP} HOSTNAME

configuration/controller/local-repos.sh

@@ -6,9 +6,6 @@
 # This is used for sites where there is no internet access, in which case all
 # packages dependencies are needed, as well as for custom-built packages.
 
-source /etc/trinity.sh
-source "$POST_CONFIG"
-
 
 echo_info 'Copying packages and setting up the local repositories'
 

configuration/controller/luna-slave.sh

@@ -1,10 +1,6 @@
 #!/bin/bash
 set -e
 
-source "$POST_CONFIG"
-source /etc/trinity.sh
-source "$TRIX_SHADOW"
-
 echo_info "Check config variables available."
 
 echo "LUNA_MONGO_PASS=${LUNA_MONGO_PASS:?"Should be defined"}"
@@ -55,10 +51,19 @@ sed -e 's/^\(\W\+disable\W\+\=\W\)yes/\1no/g' -i /etc/xinetd.d/tftp
 sed -e 's|^\(\W\+server_args\W\+\=\W-s\W\)/var/lib/tftpboot|\1/tftpboot|g' -i /etc/xinetd.d/tftp
 [ -f /tftpboot/luna_undionly.kpxe ] || cp /usr/share/ipxe/undionly.kpxe /tftpboot/luna_undionly.kpxe
 
+echo_info "Setup DNS."
+
+/usr/bin/cat >>/etc/named.conf <<EOF
+include "/etc/named.luna.zones"; 
+EOF
+
+/usr/bin/sed -i -e 's/\(.*listen-on port 53 { \).*\( };\)/\1any;\2/' /etc/named.conf
+
 echo_info "Create ssh keys."
 
 [ -f /root/.ssh/id_rsa ] || ssh-keygen -t rsa -f /root/.ssh/id_rsa -N ''
 
+echo_info "Setup nginx."
 
 if [ ! -f /etc/nginx/conf.d/nginx-luna.conf ]; then
     # copy config files
@@ -68,6 +73,21 @@ if [ ! -f /etc/nginx/conf.d/nginx-luna.conf ]; then
     cp ${POST_FILEDIR}/nginx-luna.conf /etc/nginx/conf.d/
 fi
 
+echo_info "Configure firewalld."
+
+if /usr/bin/firewall-cmd --state >/dev/null ; then
+    /usr/bin/firewall-cmd --permanent --add-port=27017/tcp
+    /usr/bin/firewall-cmd --permanent --add-port=7050/tcp
+    /usr/bin/firewall-cmd --permanent --add-port=53/tcp
+    /usr/bin/firewall-cmd --permanent --add-port=53/udp
+    /usr/bin/firewall-cmd --permanent --add-port=69/udp
+    /usr/bin/firewall-cmd --permanent --add-port=67/udp
+    /usr/bin/firewall-cmd --reload
+else 
+    echo_warn "Firewalld is not running. Ports should be should be open manually later on."
+fi
+
+
 echo_info "Start mongo."
 
 systemctl start mongod

configuration/controller/luna.pkglist

@@ -1,15 +1,13 @@
-# git
-yum-utils
 mongodb-server
 python-pymongo
 mongodb
 nginx
 python-tornado
 ipxe-bootimgs
 tftp-server
-tftp xinetd
-dhcp wget
+tftp
+xinetd
+dhcp
 rb_libtorrent-python
 net-snmp-python
 python-hostlist
-vim

configuration/controller/luna.sh

@@ -1,9 +1,6 @@
 #!/bin/bash
 set -e
 
-source "$POST_CONFIG"
-source /etc/trinity.sh
-
 function replace_template {
     [ $# -gt 3 -o $# -lt 2 ] && echo "Wrong numger of argument in replace_template." && exit 1
     if [ $# -eq 3 ]; then
@@ -23,7 +20,8 @@ echo_info "Check config variables available."
 
 echo "LUNA_FRONTEND=${LUNA_FRONTEND?"Should be defined"}"
 echo "LUNA_NETWORK=${LUNA_NETWORK?"Should be defined"}"
-echo "LUNA_NETWORK_NAME=${LUNA_NETWORK_NAME:-cluster}"
+LUNA_NETWORK_NAME=${LUNA_NETWORK_NAME:-cluster}
+echo "LUNA_NETWORK_NAME=${LUNA_NETWORK_NAME}"
 echo "LUNA_PREFIX=${LUNA_PREFIX?"Should be defined"}"
 
 LUNA_NETMASK=`ipcalc -s -m ${LUNA_NETWORK}/${LUNA_PREFIX} | sed 's/.*=//'`
@@ -48,7 +46,7 @@ setenforce 0
 echo_info "Unpack luna."
 
 pushd /
-[ -d /luna ] || tar -xzvf ${POST_FILEDIR}/luna-*.tgz
+[ -d /luna ] || git clone https://github.com/dchirikov/luna
 popd
 
 
@@ -90,10 +88,17 @@ sed -e 's/^\(\W\+disable\W\+\=\W\)yes/\1no/g' -i /etc/xinetd.d/tftp
 sed -e 's|^\(\W\+server_args\W\+\=\W-s\W\)/var/lib/tftpboot|\1/tftpboot|g' -i /etc/xinetd.d/tftp
 [ -f /tftpboot/luna_undionly.kpxe ] || cp /usr/share/ipxe/undionly.kpxe /tftpboot/luna_undionly.kpxe
 
+echo_info "Setup DNS."
+
+/usr/bin/cat >>/etc/named.conf <<EOF
+include "/etc/named.luna.zones"; 
+EOF
+
 echo_info "Create ssh keys."
 
 [ -f /root/.ssh/id_rsa ] || ssh-keygen -t rsa -f /root/.ssh/id_rsa -N ''
 
+echo_info "Setup nginx."
 
 if [ ! -f /etc/nginx/conf.d/nginx-luna.conf ]; then
     # copy config files
@@ -110,7 +115,6 @@ systemctl enable mongod
 
 echo_info "Configure mongo auth."
 
-
 #sed -i -e "s/^[# \t]\+replSet.*/replSet = luna/" /etc/mongod.conf
 #systemctl restart mongod
 #do_mongo_req "rs.initiate();"
@@ -130,7 +134,6 @@ db.createUser({user: "luna", pwd: "${_LUNA_MONGO_PASS}", roles: [{role: "dbOwner
 EOF
 cat << EOF > /etc/luna.conf
 [MongoDB]
-replicaset=luna
 server=localhost
 authdb=luna
 user=luna
@@ -148,10 +151,18 @@ echo_info "Reload systemd config."
 
 systemctl daemon-reload
 
+echo_info "Initialize luna."
+
 /usr/sbin/luna cluster init
 /usr/sbin/luna cluster change --frontend_address ${LUNA_FRONTEND}
 /usr/sbin/luna network add -n ${LUNA_NETWORK_NAME} -N ${LUNA_NETWORK} -P ${LUNA_PREFIX}
+
+echo_info "Configure DNS and DHCP."
+
 /usr/sbin/luna cluster makedhcp -N ${LUNA_NETWORK_NAME} -s ${LUNA_DHCP_RANGE_START} -e ${LUNA_DHCP_RANGE_END}
+/usr/sbin/luna cluster makedns
+
+echo_info "Start services."
 
 for service in  xinetd nginx dhcpd lweb ltorrent; do
     systemctl enable $service

configuration/controller/mariadb-master.sh

@@ -1,8 +1,5 @@
 #!/bin/bash
 set -e
-source "$POST_CONFIG"
-source /etc/trinity.sh
-source "$TRIX_SHADOW"
 
 function do_sql_req {
     if [ -f ~/.my.cnf ]; then

configuration/controller/mariadb.sh

@@ -1,10 +1,6 @@
 #!/bin/bash
 set -e
 
-source "$POST_CONFIG"
-
-source /etc/trinity.sh
-
 
 echo_info "Starting MariaDB server."
 

configuration/controller/mongodb-ha.sh

@@ -1,8 +1,5 @@
 #!/bin/bash
 set -e
-source "$POST_CONFIG"
-source /etc/trinity.sh
-source "$TRIX_SHADOW"
 
 echo_info "Check if variables are defined."