starlingx
/
utilities
Code Issues Proposed changes

Fix sourcing openrc in collect 

The openrc file is being sourced in a short lived
shell rather than in the shell of the sourcing code.

As a result the environment created by the 'source'
does not persist and the inventory request fails
which prevents collect from learning/validating
remote host names.

This update corrects that and makes the code block
involved in learning openrc variables a function
call rather than inline whenever collect_utils
is sourced.

Test Plan:

PASS: Verify collect all with no openrc already sourced
PASS: Verify collect select hosts (same no pre-openrc)
PASS: Verify collect self controller (same no pre-openrc)
PASS: Verify collect of self on compute

Change-Id: I41a097d9d751351f178a1366eb76dfb526c57b19
Closes-Bug: 1837412
Signed-off-by: Eric MacDonald <eric.macdonald@windriver.com>
This commit is contained in:
Eric MacDonald 2019-07-22 15:15:23 -04:00
parent 5ac2ae9c7e
commit ccb603a85e
4 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/collector/centos/build_srpm.data
View File

@ -1,2 +1,2 @@
SRC_DIR="scripts" SRC_DIR="scripts"
TIS_PATCH_VER=27 TIS_PATCH_VER=28

1
tools/collector/scripts/collect
View File

@ -84,6 +84,7 @@ fi
# pull in common utils and environment # pull in common utils and environment
source /usr/local/sbin/collect_utils source /usr/local/sbin/collect_utils
source_openrc_if_needed
function clean_up() function clean_up()
{ {

1
tools/collector/scripts/collect_host
View File

@ -12,6 +12,7 @@
# all collectors ; common and user defined. # all collectors ; common and user defined.
# #
source /usr/local/sbin/collect_utils source /usr/local/sbin/collect_utils
source_openrc_if_needed
# #
# parse input parameters # parse input parameters

49
tools/collector/scripts/collect_utils
View File

@ -55,34 +55,37 @@ MIN_PERCENT_SPACE_REQUIRED=75
COLLECT_LOG=/var/log/collect.log COLLECT_LOG=/var/log/collect.log
COLLECT_ERROR_LOG=/tmp/collect_error.log COLLECT_ERROR_LOG=/tmp/collect_error.log
function source_openrc_if_needed
{
# get the node and subfunction types
nodetype=""
subfunction=""
PLATFORM_CONF=/etc/platform/platform.conf
if [ -e ${PLATFORM_CONF} ] ; then
source ${PLATFORM_CONF}
fi
# get the node and subfunction types if [ "${nodetype}" != "controller" -a "${nodetype}" != "worker" -a "${nodetype}" != "storage" ] ; then
nodetype="" logger -t ${COLLECT_TAG} "could not identify nodetype ($nodetype)"
subfunction="" exit $FAIL_NODETYPE
PLATFORM_CONF=/etc/platform/platform.conf fi
if [ -e ${PLATFORM_CONF} ] ; then
source ${PLATFORM_CONF}
fi
if [ "${nodetype}" != "controller" -a "${nodetype}" != "worker" -a "${nodetype}" != "storage" ] ; then NODETYPE=$nodetype
logger -t ${COLLECT_TAG} "could not identify nodetype ($nodetype)" SUBFUNCTION=$subfunction
exit $FAIL_NODETYPE
fi
NODETYPE=$nodetype ACTIVE=false
SUBFUNCTION=$subfunction if [ "$NODETYPE" == "controller" ] ; then
# get local host activity state
ACTIVE=false OPENRC="/etc/platform/openrc"
if [ "$NODETYPE" == "controller" ] ; then if [ -e "${OPENRC}" ] ; then
# get local host activity state OS_USERNAME=""
OPENRC="/etc/platform/openrc" source ${OPENRC}
if [ -e "${OPENRC}" ] ; then if [ "${OS_USERNAME}" != "" ] ; then
rc=`source ${OPENRC}` ACTIVE=true
if [ "$rc" == "" ] ; then fi
ACTIVE=true
fi fi
fi fi
fi }
# Setup an expect command completion file. # Setup an expect command completion file.