From 25ff3b55202a10fed900d73e5070d8c657ad9730 Mon Sep 17 00:00:00 2001
From: Chris Hines <chris.hines@monash.edu>
Date: Mon, 4 Jul 2016 03:39:23 +0000
Subject: [PATCH] branch nhc out of slurm-common into its own role
---
.../installNhc.yml => nhc/tasks/main.yml} | 9 +++--
.../templates/nhc.sysconfig.j2 | 0
.../{slurm-common => nhc}/templates/nhclog.j2 | 0
roles/slurm-common/tasks/main.yml | 1 -
roles/slurm-common/templates/nhc_cron.j2 | 39 -------------------
5 files changed, 5 insertions(+), 44 deletions(-)
rename roles/{slurm-common/tasks/installNhc.yml => nhc/tasks/main.yml} (91%)
rename roles/{slurm-common => nhc}/templates/nhc.sysconfig.j2 (100%)
rename roles/{slurm-common => nhc}/templates/nhclog.j2 (100%)
delete mode 100755 roles/slurm-common/templates/nhc_cron.j2
diff --git a/roles/slurm-common/tasks/installNhc.yml b/roles/nhc/tasks/main.yml
similarity index 91%
rename from roles/slurm-common/tasks/installNhc.yml
rename to roles/nhc/tasks/main.yml
index 1b093c6d..e603ac97 100644
--- a/roles/slurm-common/tasks/installNhc.yml
+++ b/roles/nhc/tasks/main.yml
@@ -39,10 +39,6 @@
template: dest=/etc/sysconfig/nhc src=nhc.sysconfig.j2 mode=644
sudo: true
-- name: copy cron script
- template: dest={{ nhc_dir }}/sbin/nhc_cron src=nhc_cron.j2 mode=755
- sudo: true
-
- name: copy nhc log rotate script
template: dest=/etc/logrotate.d/nhc src=nhclog.j2 mode=644
sudo: true
@@ -51,3 +47,8 @@
copy: src=nhc.conf dest={{ nhc_dir }}/etc/nhc/{{ nhc_config_file }}
become: true
become_user: root
+
+- name: install nhc scripts
+ copy: src=scripts/ dest={{ nhc_dir }}/etc/nhc/
+ become: true
+ become_user: root
diff --git a/roles/slurm-common/templates/nhc.sysconfig.j2 b/roles/nhc/templates/nhc.sysconfig.j2
similarity index 100%
rename from roles/slurm-common/templates/nhc.sysconfig.j2
rename to roles/nhc/templates/nhc.sysconfig.j2
diff --git a/roles/slurm-common/templates/nhclog.j2 b/roles/nhc/templates/nhclog.j2
similarity index 100%
rename from roles/slurm-common/templates/nhclog.j2
rename to roles/nhc/templates/nhclog.j2
diff --git a/roles/slurm-common/tasks/main.yml b/roles/slurm-common/tasks/main.yml
index 019c2ce5..9fb727b7 100644
--- a/roles/slurm-common/tasks/main.yml
+++ b/roles/slurm-common/tasks/main.yml
@@ -170,5 +170,4 @@
when: slurm_lua is defined
- include: installCgroup.yml
-- include: installNhc.yml
diff --git a/roles/slurm-common/templates/nhc_cron.j2 b/roles/slurm-common/templates/nhc_cron.j2
deleted file mode 100755
index 8ec98157..00000000
--- a/roles/slurm-common/templates/nhc_cron.j2
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-error=""
-state_change="1"
-current_state="0"
-previous_state="0"
-
-[ -e /etc/sysconfig/nhc ] && . /etc/sysconfig/nhc
-config_file=${CONFFILE-/etc/nhc/nhc.conf}
-loop=${NHC_LOOP_TIME-300}
-email_subject=${NHC_EMAIL_SUBJECT-notification}
-logfile=${LOGFILE-/var/log/nhc.log}
-loglevel=${LOG_LEVEL-0}
-email_to=${NHC_EMAIL_TO-root}
-
-function log() {
- message="$1"
- echo "$(date): ${message}" >> ${logfile}
-}
-
-function email() {
- post=$(cat /root/nhc_cron_sendemail.txt)
- if [ -z "${post}" ]; then
- message=$(cat /root/nhc.log)
- echo "${message}" | mail -s "${email_subject}" "${email_to}"
- log "Node error, send email to ${email_to}"
- echo "1" >| /root/nhc_cron_sendemail.txt
- fi
-}
-
-if [ ${loglevel} -gt "0" ]; then
- log "Start health check ${config_file}"
-fi
-
-nhc -c "${config_file}" > /root/nhc.log 2>&1 || { log "$(cat /root/nhc.log)" && email && exit 1; }
-
-echo -n "" >| /root/nhc_cron_sendemail.txt
-
-
--
GitLab