From 32fb0a4e9c6b7bc8c8d79fa17ef5be4b93021ca4 Mon Sep 17 00:00:00 2001
From: Al Bailey <Al.Bailey@windriver.com>
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 <Al.Bailey@windriver.com>
---
 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 +-
 .../storage_topology/exec/storage_topology.py                 | 4 ++--
 6 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/tools/collector/scripts/etc.exclude b/tools/collector/scripts/etc.exclude
index d870e9b22..be9bdc8fc 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 e5ccd1ab2..4323ceee0 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 21a47a4f3..11b2e115c 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 5637bfd22..f8bb9b7b8 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 095c5ddb7..4fdfc487e 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
diff --git a/tools/storage-topology/storage-topology/storage_topology/exec/storage_topology.py b/tools/storage-topology/storage-topology/storage_topology/exec/storage_topology.py
index b56885eb0..8bdefa2da 100644
--- a/tools/storage-topology/storage-topology/storage_topology/exec/storage_topology.py
+++ b/tools/storage-topology/storage-topology/storage_topology/exec/storage_topology.py
@@ -143,11 +143,11 @@ def parse_arguments(show):
 
 def get_system_creds():
 
-    """ Return keystone credentials by sourcing /etc/nova/openrc. """
+    """ Return keystone credentials by sourcing /etc/platform/openrc. """
     d = {}
 
     proc = subprocess.Popen(['bash', '-c',
-                             'source /etc/nova/openrc && env'],
+                             'source /etc/platform/openrc && env'],
                             stdout=subprocess.PIPE)
 
     for line in proc.stdout: