starlingx/integ
Code Issues Proposed changes

Updating script references for openrc

Browse Source 
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>
This commit is contained in:
Al Bailey 2019-04-08 08:44:56 -05:00
parent 12565aba00
commit 32fb0a4e9c
6 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/collector/scripts/etc.exclude
View File

@ -1,5 +1,3 @@
/etc/cinder/volumes
/etc/nova/instances
/etc/postgresql /etc/postgresql
/etc/alternatives /etc/alternatives
/etc/terminfo /etc/terminfo

2
tools/engtools/hostdata-collectors/scripts/remote/rbzip2-engtools.sh
View File

@ -11,7 +11,7 @@ if [ $UID -eq 0 ]; then
fi fi
# environment for system commands # environment for system commands
source /etc/nova/openrc source /etc/platform/openrc
declare -a CONTROLLER declare -a CONTROLLER
declare -a COMPUTE declare -a COMPUTE

2
tools/engtools/hostdata-collectors/scripts/remote/rstart-engtools.sh
View File

@ -11,7 +11,7 @@ if [ $UID -eq 0 ]; then
fi fi
# environment for system commands # environment for system commands
source /etc/nova/openrc source /etc/platform/openrc
declare -a BLADES declare -a BLADES
BLADES=( $(system host-list | awk '(/compute|controller|storage/) {print $4;}') ) BLADES=( $(system host-list | awk '(/compute|controller|storage/) {print $4;}') )

2
tools/engtools/hostdata-collectors/scripts/remote/rstop-engtools.sh
View File

@ -11,7 +11,7 @@ if [ $UID -eq 0 ]; then
fi fi
# environment for system commands # environment for system commands
source /etc/nova/openrc source /etc/platform/openrc
declare -a BLADES declare -a BLADES
BLADES=( $(system host-list | awk '(/compute|controller|storage/) {print $4;}') ) BLADES=( $(system host-list | awk '(/compute|controller|storage/) {print $4;}') )

2
tools/engtools/hostdata-collectors/scripts/remote/rsync-engtools-data.sh
View File

@ -11,7 +11,7 @@ if [ $UID -eq 0 ]; then
fi fi
# environment for system commands # environment for system commands
source /etc/nova/openrc source /etc/platform/openrc
declare -a BLADES declare -a BLADES
declare -a CONTROLLER declare -a CONTROLLER

4
tools/storage-topology/storage-topology/storage_topology/exec/storage_topology.py
View File

@ -143,11 +143,11 @@ def parse_arguments(show):
def get_system_creds(): def get_system_creds():
""" Return keystone credentials by sourcing /etc/nova/openrc. """ """ Return keystone credentials by sourcing /etc/platform/openrc. """
d = {} d = {}
proc = subprocess.Popen(['bash', '-c', proc = subprocess.Popen(['bash', '-c',
'source /etc/nova/openrc && env'], 'source /etc/platform/openrc && env'],
stdout=subprocess.PIPE) stdout=subprocess.PIPE)
for line in proc.stdout: for line in proc.stdout: