matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[docker-platform-monitor] Check if sonic_platform is available before installed (#5764)

Browse Source 
On Arista platforms, sonic_platform packages are not installed in the PMon container, but are rather mounted into the container from the host OS. Therefore, pip show sonic_platform will fail in the PMon container. This change will first check if we can import sonic_platform. If this fails, it will then fall back to checking if the package is installed. If both fail, it will attempt to install the package.
This commit is contained in:
Joe LeVeque 2020-11-01 01:48:07 -08:00 committed by GitHub
parent c8a00eda95
commit f2a258aca9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dockers/docker-platform-monitor/start.sh
View File

@ -16,7 +16,7 @@ if [ -e /usr/share/sonic/platform/platform_wait ]; then
fi
# If the Python 2 sonic-platform package is not installed, try to install it
pip2 show sonic-platform > /dev/null 2>&1
python2 -c "import sonic_platform" > /dev/null 2>&1 || pip2 show sonic-platform > /dev/null 2>&1
if [ $? -ne 0 ]; then
SONIC_PLATFORM_WHEEL="/usr/share/sonic/platform/sonic_platform-1.0-py2-none-any.whl"
echo "sonic-platform package not installed, attempting to install..."
@ -33,7 +33,7 @@ if [ $? -ne 0 ]; then
fi
# If the Python 3 sonic-platform package is not installed, try to install it
pip3 show sonic-platform > /dev/null 2>&1
python3 -c "import sonic_platform" > /dev/null 2>&1 || pip3 show sonic-platform > /dev/null 2>&1
if [ $? -ne 0 ]; then
SONIC_PLATFORM_WHEEL="/usr/share/sonic/platform/sonic_platform-1.0-py3-none-any.whl"
echo "sonic-platform package not installed, attempting to install..."