From ca74c5401fbe906627a1199149cd2272f51d482e Mon Sep 17 00:00:00 2001 From: Al Bailey Date: Mon, 8 Apr 2019 08:44:56 -0500 Subject: [PATCH] Updating script references for openrc Old location: /etc/nova/openrc New location: /etc/platform/openrc The collect script exclude folder is also updated since /etc/nova and etc/cinder no longer exist on baremetal. Story: 2004764 Task: 29907 Change-Id: Iae521fb1d6d394f7ffcf474e7726963215b88bcd Signed-off-by: Al Bailey --- tools/collector/scripts/etc.exclude | 2 -- .../hostdata-collectors/scripts/remote/rbzip2-engtools.sh | 2 +- .../hostdata-collectors/scripts/remote/rstart-engtools.sh | 2 +- .../hostdata-collectors/scripts/remote/rstop-engtools.sh | 2 +- .../hostdata-collectors/scripts/remote/rsync-engtools-data.sh | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tools/collector/scripts/etc.exclude b/tools/collector/scripts/etc.exclude index d870e9b2..be9bdc8f 100644 --- a/tools/collector/scripts/etc.exclude +++ b/tools/collector/scripts/etc.exclude @@ -1,5 +1,3 @@ -/etc/cinder/volumes -/etc/nova/instances /etc/postgresql /etc/alternatives /etc/terminfo diff --git a/tools/engtools/hostdata-collectors/scripts/remote/rbzip2-engtools.sh b/tools/engtools/hostdata-collectors/scripts/remote/rbzip2-engtools.sh index e5ccd1ab..4323ceee 100644 --- a/tools/engtools/hostdata-collectors/scripts/remote/rbzip2-engtools.sh +++ b/tools/engtools/hostdata-collectors/scripts/remote/rbzip2-engtools.sh @@ -11,7 +11,7 @@ if [ $UID -eq 0 ]; then fi # environment for system commands -source /etc/nova/openrc +source /etc/platform/openrc declare -a CONTROLLER declare -a COMPUTE diff --git a/tools/engtools/hostdata-collectors/scripts/remote/rstart-engtools.sh b/tools/engtools/hostdata-collectors/scripts/remote/rstart-engtools.sh index 21a47a4f..11b2e115 100644 --- a/tools/engtools/hostdata-collectors/scripts/remote/rstart-engtools.sh +++ b/tools/engtools/hostdata-collectors/scripts/remote/rstart-engtools.sh @@ -11,7 +11,7 @@ if [ $UID -eq 0 ]; then fi # environment for system commands -source /etc/nova/openrc +source /etc/platform/openrc declare -a BLADES BLADES=( $(system host-list | awk '(/compute|controller|storage/) {print $4;}') ) diff --git a/tools/engtools/hostdata-collectors/scripts/remote/rstop-engtools.sh b/tools/engtools/hostdata-collectors/scripts/remote/rstop-engtools.sh index 5637bfd2..f8bb9b7b 100644 --- a/tools/engtools/hostdata-collectors/scripts/remote/rstop-engtools.sh +++ b/tools/engtools/hostdata-collectors/scripts/remote/rstop-engtools.sh @@ -11,7 +11,7 @@ if [ $UID -eq 0 ]; then fi # environment for system commands -source /etc/nova/openrc +source /etc/platform/openrc declare -a BLADES BLADES=( $(system host-list | awk '(/compute|controller|storage/) {print $4;}') ) diff --git a/tools/engtools/hostdata-collectors/scripts/remote/rsync-engtools-data.sh b/tools/engtools/hostdata-collectors/scripts/remote/rsync-engtools-data.sh index 095c5ddb..4fdfc487 100644 --- a/tools/engtools/hostdata-collectors/scripts/remote/rsync-engtools-data.sh +++ b/tools/engtools/hostdata-collectors/scripts/remote/rsync-engtools-data.sh @@ -11,7 +11,7 @@ if [ $UID -eq 0 ]; then fi # environment for system commands -source /etc/nova/openrc +source /etc/platform/openrc declare -a BLADES declare -a CONTROLLER