diff --git a/tools/collector/centos/build_srpm.data b/tools/collector/centos/build_srpm.data index a9d3f505..abb9f2e2 100644 --- a/tools/collector/centos/build_srpm.data +++ b/tools/collector/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="scripts" -TIS_PATCH_VER=29 +TIS_PATCH_VER=30 diff --git a/tools/collector/scripts/collect_host b/tools/collector/scripts/collect_host index 46cdb5ce..e94177ac 100755 --- a/tools/collector/scripts/collect_host +++ b/tools/collector/scripts/collect_host @@ -1,12 +1,27 @@ #! /bin/bash ######################################################################## # -# Copyright (c) 2016 Wind River Systems, Inc. +# Copyright (c) 2016-2019 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # ######################################################################## +# make these platform.conf variables global. +# values are loaded in source_openrc_if_needed. +export nodetype="" +export subfunction="" +export system_type="" +export security_profile="" +export sdn_enabled="" +export region_config="" +export vswitch_type="" +export system_mode="" +export sw_version="" + +# assume this is not the active controller until learned +export ACTIVE=false + # # Import commands, variables and convenience functions available to # all collectors ; common and user defined. diff --git a/tools/collector/scripts/collect_utils b/tools/collector/scripts/collect_utils index b211fcef..195b22e7 100755 --- a/tools/collector/scripts/collect_utils +++ b/tools/collector/scripts/collect_utils @@ -1,6 +1,6 @@ #! /bin/bash # -# Copyright (c) 2013-2014 Wind River Systems, Inc. +# Copyright (c) 2013-2019 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # @@ -70,11 +70,8 @@ function source_openrc_if_needed exit $FAIL_NODETYPE fi - NODETYPE=$nodetype - SUBFUNCTION=$subfunction - ACTIVE=false - if [ "$NODETYPE" == "controller" ] ; then + if [ "$nodetype" == "controller" ] ; then # get local host activity state OPENRC="/etc/platform/openrc" if [ -e "${OPENRC}" ] ; then