Reduced code - solves issue #4 and #5.

citellus

@@ -143,6 +143,7 @@ PYTHON="/usr/bin/python"
 TMPFILE="$(mktemp /tmp/cittelus-script.XXXXXX)"
 # Check if we are running openstack plugin if empty by default to openstack
 get_version
+
 PLUGIN="$(echo ${PLUGIN} | tr ',' ' ')"
 if [ -n "${PLUGIN}" ]
 then
@@ -152,67 +153,35 @@ then
     if [[ "${FOUND}" -eq "1" ]]
     then
       if [ "${plugin}" = "openstack" ]
-      then
-        discover_node
-	print_version
+	then
+	  discover_node
+	  print_version
       fi
-      # Go thru the all existing .conf files inside DISCOVERED_NODE.d directory/.
-      for FILE in ./plugins/"${plugin}"/generic/all/* ./plugins/"${plugin}"/generic/"${DISCOVERED_NODE}"/* ./plugins/"${plugin}"/"${VERSION}"/generic/* ./plugins/"${plugin}"/"${VERSION}"/"${DISCOVERED_NODE}"/*
+      for FILE in ./plugins/"${plugin}"/*
       do
-	  [ -f "$FILE" ] || continue
-	  EXTENSION=${FILE##*.} 
-	  case ${EXTENSION} in
-	    sh) 
-		source "${FILE}" > "${TMPFILE}"
-
-		PASS=$(grep ".*\[OK\]" "${TMPFILE}" | wc -l)
-		FAIL=$(grep ".*\[WRONG\]" "${TMPFILE}" | wc -l)
-		WARNING=$(grep ".*\[WARN\]" "${TMPFILE}" | wc -l)
-
-		if [[ "${FAIL}" -eq "0" ]] && [[ "${WARNING}" -eq "0" ]]
-		then
-		  RESULT=$(
-			   tput setaf 2
-			   printf "%s" "PASSED "
-			   tput sgr0
-			  )
-		elif [[ "${FAIL}" -eq "0" ]] && [[ ! "${WARNING}" -eq "0" ]]
-		then
-		  RESULT=$(
-			   tput setaf 3
-			   printf "%s" "WARNING"
-			   tput sgr0
-			  )
-		else
-		  RESULT=$(
-			   tput setaf 1 
-			   printf "%s" "FAILED "
-			   tput sgr0
-			  )
-		fi         
-
-		if [[ ${RESULT} =~ "PASS" ]] && [[ ${verbose_good} -eq "0" ]]
-		then
-		  continue
-		else
-		  printf -v line "+%*s+" "77"
-		  echo ${line// /-}
-		  printf "| %-75s %s\n" "${REFNAME}" "|"
-		  printf -v line "+%*s+ %-30s |" "44"
-		  echo ${line// /-}
-		  printf "| PASS: %-9s FAILED: %-6s WARNING: %-2s %-16s Result: %s %s\n" \
-			 "${PASS}" "${FAIL}" "${WARNING}" "|" "${RESULT}" "|"
-		  printf -v line "+%*s+" "77"
-		  echo ${line// /-}
-
-		  $(which cat) "${TMPFILE}"
-		  $(which rm) -f "${TMPFILE}"
-		fi
-		;;
-
-	    py) ${PYTHON} ${FILE} ${DIRECTORY} ;;
-	    *) echo "File: ${FILE}. Usupported format." ;;
-	  esac
+        [ -f "${FILE}" ] || continue
+        EXTENSION=${FILE##*.}
+	if [ "${plugin}" = "openstack" ]
+	  then
+           if grep -q "^REFOSP_VERSION=.*${VERSION}.*$" "${FILE}" && grep -q "^REFNODE_TYPE=.*${DISCOVERED_NODE}.*$" "${FILE}"
+           then
+	     case ${EXTENSION} in
+	       sh) 
+                   run_sh
+                   ;;
+	       py) ${PYTHON} ${FILE} ${DIRECTORY} ;;
+	       *) echo "File: ${FILE}. Usupported format." ;;
+	     esac
+           fi
+         else
+           case ${EXTENSION} in
+             sh)
+                 run_sh
+                 ;;
+             py) ${PYTHON} ${FILE} ${DIRECTORY} ;;
+             *) echo "File: ${FILE}. Usupported format." ;;
+           esac
+         fi
       done
     fi
   done

load_functions

@@ -84,11 +84,64 @@ get_version(){
 }
 
 print_version(){
+
   echo "Discovered node: ${DISCOVERED_NODE}"
   echo "Version: ${VERSION}"
   if [ -n "${PACKSTACK}" ]
     then echo "Type: POC-type environment installed with Packstack"
   fi
+
+}
+
+run_sh(){
+
+  source "${FILE}" > "${TMPFILE}"
+
+  PASS=$(grep ".*\[OK\]" "${TMPFILE}" | wc -l)
+  FAIL=$(grep ".*\[WRONG\]" "${TMPFILE}" | wc -l)
+  WARNING=$(grep ".*\[WARN\]" "${TMPFILE}" | wc -l)
+
+  if [[ "${FAIL}" -eq "0" ]] && [[ "${WARNING}" -eq "0" ]]
+  then
+    RESULT=$(
+      tput setaf 2
+      printf "%s" "PASSED "
+      tput sgr0
+     )
+  elif [[ "${FAIL}" -eq "0" ]] && [[ ! "${WARNING}" -eq "0" ]]
+  then
+    RESULT=$(
+      tput setaf 3
+      printf "%s" "WARNING"
+      tput sgr0
+     )
+  else
+    RESULT=$(
+      tput setaf 1 
+      printf "%s" "FAILED "
+      tput sgr0
+     )
+  fi         
+
+  if [[ ${RESULT} =~ "PASS" ]] && [[ ${verbose_good} -eq "0" ]]
+  then
+    continue
+  else
+    printf -v line "+%*s+" "77"
+    echo ${line// /-}
+    printf "| %-75s %s\n" "${REFNAME}" "|"
+    printf -v line "+%*s+ %-30s |" "44"
+    echo ${line// /-}
+    printf "| PASS: %-9s FAILED: %-6s WARNING: %-2s %-16s Result: %s %s\n" \
+    "${PASS}" "${FAIL}" "${WARNING}" "|" "${RESULT}" "|"
+    printf -v line "+%*s+" "77"
+    echo ${line// /-}
+
+    $(which cat) "${TMPFILE}"
+    $(which rm) -f "${TMPFILE}"
+  fi
+
+
 }
 
 good(){

plugins/openstack/kilo/controller/hwreq.sh → plugins/openstack/k_ctrl_hwreq.sh

@@ -18,6 +18,8 @@
 # Checking Hardware Requirements
 # Ref: https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux_openstack_platform/7/html/director_installation_and_usage/sect-overcloud_requirements#sect-Controller_Node_Requirements
 REFNAME="Checking Hardware Requirements"
+REFOSP_VERSION="kilo"
+REFNODE_TYPE="controller"
 
 # A minimum of 6 GB of RAM.
 if [ -e "${DIRECTORY}/proc/meminfo" ]

plugins/openstack/generic/compute/hwreq.sh → plugins/openstack/klmno_cmp_hwreq.sh

@@ -18,6 +18,8 @@
 # Checking Hardware Requirements
 # Ref: https://access.redhat.com/documentation/en-us/red_hat_openstack_platform/10/html/director_installation_and_usage/chap-requirements#sect-Compute_Node_Requirements
 REFNAME="Checking Hardware Requirements"
+REFOSP_VERSION="kilo liberty mitaka newton ocata"
+REFNODE_TYPE="compute"
 
 # A minimum of 6 GB of RAM.
 if [ -e "${DIRECTORY}/proc/meminfo" ]

plugins/openstack/liberty/controller/hwreq.sh → plugins/openstack/l_ctrl_hwreq.sh

@@ -19,6 +19,8 @@
 # Ref: https://access.redhat.com/documentation/en-us/red_hat_openstack_platform/8/html-single/director_installation_and_usage/#sect-Controller_Node_Requirements
 # Red Hat Enterprise Linux 7.2 or later installed as the host operating system. 
 REFNAME="Checking Hardware Requirements"
+REFOSP_VERSION="liberty"
+REFNODE_TYPE="controller"
 
 # A minimum of 32 GB of RAM.
 if [ -e "${DIRECTORY}/proc/meminfo" ]

plugins/openstack/liberty/director/hwreq.sh → plugins/openstack/lm_dir_hwreq.sh

@@ -20,6 +20,8 @@
 
 # Red Hat Enterprise Linux 7.2 or later installed as the host operating system. 
 REFNAME="Checking Hardware Requirements"
+REFOSP_VERSION="liberty mitaka"
+REFNODE_TYPE="director"
 
 # A minimum of 16 GB of RAM.
 if [ -e "${DIRECTORY}/proc/meminfo" ]

plugins/system/generic/all/kernel.sh → plugins/openstack/lmno_ctrl-dir-cmp_kernel.sh

@@ -18,6 +18,8 @@
 # Checking Tracebacks
 # Ref: None
 REFNAME="Kernel Module"
+REFOSP_VERSION="liberty mitaka newton ocata"
+REFNODE_TYPE="controller director compute"
 
 # Looks for the Kernel Out of Memory, panics and soft locks
 

plugins/system/generic/all/selinux.sh → plugins/openstack/lmno_ctrl-dir-cmp_selinux.sh

@@ -18,6 +18,8 @@
 # Checking Tracebacks
 # Ref: None
 REFNAME="SELinux Module"
+REFOSP_VERSION="liberty mitaka newton ocata"
+REFNODE_TYPE="controller director compute"
 
 # SELinux is enabled on the host.
 

plugins/openstack/generic/all/traceback.sh → plugins/openstack/lmno_ctrl-dir-cmp_traceback.sh

@@ -18,6 +18,8 @@
 # Checking Tracebacks
 # Ref: None
 REFNAME="Traceback Module"
+REFOSP_VERSION="liberty mitaka newton ocata"
+REFNODE_TYPE="controller director compute"
 
 # Tracebacks everywhere
 

plugins/openstack/liberty/director/cronjob.sh → plugins/openstack/lmno_ctrl-dir_cronjob.sh

@@ -18,6 +18,8 @@
 # Checking cronjob
 # Ref: https://access.redhat.com/documentation/en-us/red_hat_openstack_platform/8/html-single/director_installation_and_usage/#sect-Tuning_the_Undercloud 
 REFNAME="Checking cronjob"
+REFOSP_VERSION="liberty mitaka newton ocata"
+REFNODE_TYPE="director controller"
 
 # Crontab check
 grep_file "${DIRECTORY}/var/spool/cron/keystone" "keystone-manage token_flush"

plugins/openstack/generic/controller/cluster.sh → plugins/openstack/lmno_ctrl_cluster.sh

@@ -18,6 +18,8 @@
 # Cluster check
 # Ref: 
 REFNAME="Checking HA Cluster"
+REFOSP_VERSION="liberty mitaka newton ocata"
+REFNODE_TYPE="controller"
 
 # Checking the number of nodes in the cluster.
 # Check which directory for cluster exists it's either cluster or pacemaker
@@ -54,8 +56,8 @@ else
 fi
 
 # Check packages version
-VERSION=$(sed -n -r -e 's/^pacemaker.*-1.1.([0-9]+)-.*$/\1/p' "${DIRECTORY}/installed-rpms")
-for package in ${VERSION}
+PCS_VERSION=$(sed -n -r -e 's/^pacemaker.*-1.1.([0-9]+)-.*$/\1/p' "${DIRECTORY}/installed-rpms")
+for package in ${PCS_VERSION}
 do
   if [[ "${package}" -lt "15" ]]
   then

plugins/openstack/generic/controller/custom.sh → plugins/openstack/lmno_ctrl_custom.sh

@@ -18,6 +18,8 @@
 # Checking ERRORS
 # Ref: None
 REFNAME="My Custom Module"
+REFOSP_VERSION="liberty mitaka newton ocata"
+REFNODE_TYPE="controller"
 
 
 # https://bugs.launchpad.net/keystone/+bug/1649616/

plugins/openstack/generic/controller/httpd.sh → plugins/openstack/lmno_ctrl_httpd.sh

@@ -18,8 +18,8 @@
 # Checking httpd
 # Ref: None
 REFNAME="httpd Module"
-
-
+REFOSP_VERSION="liberty mitaka newton ocata"
+REFNODE_TYPE="controller"
 
 count_lines "${DIRECTORY}/var/log/httpd/error_log" "MaxRequestWorkers" \
 " \_ Check /etc/httpd/prefork.conf values MaxClients and ServerLimit are set to value 512 - Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1163516"

plugins/openstack/generic/controller/rabbitmq.sh → plugins/openstack/lmno_ctrl_rabbitmq.sh

@@ -18,6 +18,8 @@
 # RabbitMQ Module
 # Ref: 
 REFNAME="Checking RabbitMQ"
+REFOSP_VERSION="liberty mitaka newton ocata"
+REFNODE_TYPE="controller"
 
 # RabbitMQ
 

plugins/openstack/generic/director/custom.sh → plugins/openstack/lmno_dir_custom.sh

@@ -18,7 +18,8 @@
 # Checking ERRORS
 # Ref: None
 REFNAME="My Custom Module"
-
+REFOSP_VERSION="liberty mitaka newton ocata"
+REFNODE_TYPE="director"
 
 # Check for iptables -t nat -j REDIRECT rule for metadata server exists.
 # Happens that when deployment is stuck without any FAILURE might be

plugins/openstack/liberty/director/tuning.sh → plugins/openstack/lmno_dir_tuning.sh

@@ -18,6 +18,8 @@
 # Checking Tuned Undercloud options
 # Ref: https://access.redhat.com/documentation/en-us/red_hat_openstack_platform/8/html-single/director_installation_and_usage/#sect-Tuning_the_Undercloud
 REFNAME="Checking Tuning options"
+REFOSP_VERSION="liberty mitaka newton ocata"
+REFNODE_TYPE="director"
 
 # Checking /etc/heat/heat.conf