Skip to content

Commit 6f4ef03

Browse files
authored
[arista] Update driver submodules (#5147)
- fix watchdog timeout units - fix import path for thermal_manager - remove arista bind mounts for docker-snmp - improve arista bind mounts for pmon
1 parent 90cbb4d commit 6f4ef03

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

rules/docker-platform-monitor.mk

+3-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ $(DOCKER_PLATFORM_MONITOR)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
4141

4242
# Mount Arista python library on Aboot images to be used by plugins
4343
$(DOCKER_PLATFORM_MONITOR)_aboot_RUN_OPT += -v /usr/lib/python2.7/dist-packages/arista:/usr/lib/python2.7/dist-packages/arista:ro
44-
$(DOCKER_PLATFORM_MONITOR)_aboot_RUN_OPT += -v /usr/lib/python2.7/dist-packages/arista/utils/sonic_platform:/usr/lib/python2.7/dist-packages/sonic_platform:ro
44+
$(DOCKER_PLATFORM_MONITOR)_aboot_RUN_OPT += -v /usr/lib/python3/dist-packages/arista:/usr/lib/python3/dist-packages/arista:ro
45+
$(DOCKER_PLATFORM_MONITOR)_aboot_RUN_OPT += -v /usr/lib/python2.7/dist-packages/sonic_platform:/usr/lib/python2.7/dist-packages/sonic_platform:ro
46+
$(DOCKER_PLATFORM_MONITOR)_aboot_RUN_OPT += -v /usr/lib/python3/dist-packages/sonic_platform:/usr/lib/python3/dist-packages/sonic_platform:ro
4547

4648
$(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/bin/sensors
4749
$(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/sbin/smartctl

rules/docker-snmp.mk

-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,5 @@ SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_SNMP_DBG)
2626
$(DOCKER_SNMP)_CONTAINER_NAME = snmp
2727
$(DOCKER_SNMP)_RUN_OPT += --privileged -t
2828
$(DOCKER_SNMP)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
29-
# mount Arista platform python libraries to support corresponding platforms SNMP power status query
30-
$(DOCKER_SNMP)_RUN_OPT += -v /usr/lib/python3/dist-packages/arista:/usr/lib/python3/dist-packages/arista:ro
3129
$(DOCKER_SNMP)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
3230
$(DOCKER_SNMP)_BASE_IMAGE_FILES += monit_snmp:/etc/monit/conf.d

0 commit comments

Comments
 (0)