Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Pmon] Add new daemon "syseepromd" to pmon docker #2866

Merged
merged 14 commits into from
Jun 18, 2019
Merged

[Pmon] Add new daemon "syseepromd" to pmon docker #2866

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
00bc96a
add make file and start.sh to support post-syseeprom
keboliu Mar 14, 2019
5105be1
fix confllicts
keboliu May 5, 2019
961fa28
add clear state db code
keboliu May 5, 2019
6755b90
add pmon event listener
keboliu May 17, 2019
7c82a39
move event-listener to sonic/dockers/docker-platform-monitor folder
keboliu May 20, 2019
f43de3a
add scripts
keboliu May 20, 2019
c498dca
add error code handling for calling scrpits
keboliu May 22, 2019
a992835
remove extra empty line
keboliu May 22, 2019
c002f7f
Revert "remove extra empty line"
keboliu Jun 5, 2019
162a763
change it from one-shot task to a daemon
keboliu Jun 5, 2019
db3ea2c
remove extra blank line
keboliu Jun 5, 2019
6daae18
set conf to have syseepromd can always be restarted
keboliu Jun 15, 2019
b97e5fa
update submodule pointer
keboliu Jun 18, 2019
f9525a2
merge master to branch
keboliu Jun 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions dockers/docker-platform-monitor/start.sh.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,6 @@ supervisorctl start xcvrd
{% if not skip_psud %}
supervisorctl start psud
{% endif %}

post-syseeprom -w
keboliu marked this conversation as resolved.
Show resolved Hide resolved

keboliu marked this conversation as resolved.
Show resolved Hide resolved
3 changes: 3 additions & 0 deletions files/build_templates/docker_image_ctl.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,9 @@ wait() {
}

stop() {
{%- if docker_container_name == "pmon" %}
docker exec pmon post-syseeprom -c
keboliu marked this conversation as resolved.
Show resolved Hide resolved
{%- endif %}
docker stop {{docker_container_name}}
}

Expand Down
2 changes: 1 addition & 1 deletion rules/docker-platform-monitor.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
DOCKER_PLATFORM_MONITOR = docker-platform-monitor.gz
$(DOCKER_PLATFORM_MONITOR)_PATH = $(DOCKERS_PATH)/docker-platform-monitor
$(DOCKER_PLATFORM_MONITOR)_DEPENDS += $(LIBSENSORS) $(LM_SENSORS) $(FANCONTROL) $(SENSORD) $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON) $(SMARTMONTOOLS)
$(DOCKER_PLATFORM_MONITOR)_PYTHON_DEBS += $(SONIC_LEDD) $(SONIC_XCVRD) $(SONIC_PSUD)
$(DOCKER_PLATFORM_MONITOR)_PYTHON_DEBS += $(SONIC_LEDD) $(SONIC_XCVRD) $(SONIC_PSUD) $(SONIC_POST_SYSEEPROM)
$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY2)
$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SWSSSDK_PY2)
$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PLATFORM_API_PY2)
Expand Down
5 changes: 5 additions & 0 deletions rules/sonic-post-syseeprom.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# sonic-post-syseeprom (SONiC Syseeprom gathering task) Debian package

SONIC_POST_SYSEEPROM = python-sonic-post-syseeprom_1.0-1_all.deb
$(SONIC_POST_SYSEEPROM)_SRC_PATH = $(SRC_PATH)/sonic-platform-daemons/sonic-post-syseeprom
SONIC_PYTHON_STDEB_DEBS += $(SONIC_POST_SYSEEPROM)