From b3abf9af7f8359d28467d70bfea424f61d645cbe Mon Sep 17 00:00:00 2001
From: "Kevin(Shengkai) Wang" <kevinw@mellanox.com>
Date: Wed, 16 Jan 2019 13:24:47 +0800
Subject: [PATCH] [docker-platform-monitor] add psud daemon to Pmon (#2423)

* Add psud daemon to pmon container
* Update submodule sonic-platform-daemons

Submodule update sonic-platform-daemons:

e5d8155 - [sonic-psud] add a new daemon sonic-psud to platform monitor (#20)

Signed-off-by: Kevin Wang <kevinw@mellanox.com>
---
 dockers/docker-platform-monitor/start.sh         |  2 ++
 dockers/docker-platform-monitor/supervisord.conf | 10 ++++++++++
 rules/docker-platform-monitor.mk                 |  2 +-
 rules/sonic-psud.mk                              |  5 +++++
 src/sonic-platform-daemons                       |  2 +-
 5 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 rules/sonic-psud.mk

diff --git a/dockers/docker-platform-monitor/start.sh b/dockers/docker-platform-monitor/start.sh
index 30699694b6..18541b80fe 100755
--- a/dockers/docker-platform-monitor/start.sh
+++ b/dockers/docker-platform-monitor/start.sh
@@ -28,3 +28,5 @@ fi
 supervisorctl start ledd
 
 supervisorctl start xcvrd
+
+supervisorctl start psud
diff --git a/dockers/docker-platform-monitor/supervisord.conf b/dockers/docker-platform-monitor/supervisord.conf
index aa947ce2c9..2854d0510f 100644
--- a/dockers/docker-platform-monitor/supervisord.conf
+++ b/dockers/docker-platform-monitor/supervisord.conf
@@ -54,3 +54,13 @@ autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 startsecs=0
+
+[program:psud]
+command=/usr/bin/psud
+priority=7
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+startsecs=0
+
diff --git a/rules/docker-platform-monitor.mk b/rules/docker-platform-monitor.mk
index d6404e18c4..c8f8e91365 100644
--- a/rules/docker-platform-monitor.mk
+++ b/rules/docker-platform-monitor.mk
@@ -2,7 +2,7 @@
 
 DOCKER_PLATFORM_MONITOR = docker-platform-monitor.gz
 $(DOCKER_PLATFORM_MONITOR)_PATH = $(DOCKERS_PATH)/docker-platform-monitor
-$(DOCKER_PLATFORM_MONITOR)_DEPENDS += $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON) $(SONIC_LEDD) $(SONIC_XCVRD)
+$(DOCKER_PLATFORM_MONITOR)_DEPENDS += $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON) $(SONIC_LEDD) $(SONIC_XCVRD) $(SONIC_PSUD)
 $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY2)
 $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SWSSSDK_PY2)
 $(DOCKER_PLATFORM_MONITOR)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE)
diff --git a/rules/sonic-psud.mk b/rules/sonic-psud.mk
new file mode 100644
index 0000000000..0249115359
--- /dev/null
+++ b/rules/sonic-psud.mk
@@ -0,0 +1,5 @@
+# sonic-psud (SONiC PSU daemon) Debian package
+
+SONIC_PSUD = python-sonic-psud_1.0-1_all.deb
+$(SONIC_PSUD)_SRC_PATH = $(SRC_PATH)/sonic-platform-daemons/sonic-psud
+SONIC_PYTHON_STDEB_DEBS += $(SONIC_PSUD)
diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index bc23ab0b0b..e5d8155863 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit bc23ab0b0b87b3ed022a7728c069e580b70bf23d
+Subproject commit e5d81558637790e964b3afd018d8210891b15681