From 8ee02c0bc0b90e1a6ebbfd5b19024a6d42f79a7e Mon Sep 17 00:00:00 2001 From: Kebo Liu Date: Tue, 19 Oct 2021 19:29:57 +0800 Subject: [PATCH] skip chassis_db_init of pmon on simx platform Signed-off-by: Kebo Liu --- .../x86_64-mlnx_msn2700_simx-r0/pmon_daemon_control.json | 3 ++- .../x86_64-mlnx_msn3700_simx-r0/pmon_daemon_control.json | 8 +------- .../x86_64-mlnx_msn4700_simx-r0/pmon_daemon_control.json | 8 +------- .../x86_64-mlnx_msn4800_simx-r0/pmon_daemon_control.json | 8 +------- .../docker-pmon.supervisord.conf.j2 | 2 ++ 5 files changed, 7 insertions(+), 22 deletions(-) mode change 100644 => 120000 device/mellanox/x86_64-mlnx_msn3700_simx-r0/pmon_daemon_control.json mode change 100644 => 120000 device/mellanox/x86_64-mlnx_msn4700_simx-r0/pmon_daemon_control.json mode change 100644 => 120000 device/mellanox/x86_64-mlnx_msn4800_simx-r0/pmon_daemon_control.json diff --git a/device/mellanox/x86_64-mlnx_msn2700_simx-r0/pmon_daemon_control.json b/device/mellanox/x86_64-mlnx_msn2700_simx-r0/pmon_daemon_control.json index dd83c2db12c5..e7852dad6d11 100644 --- a/device/mellanox/x86_64-mlnx_msn2700_simx-r0/pmon_daemon_control.json +++ b/device/mellanox/x86_64-mlnx_msn2700_simx-r0/pmon_daemon_control.json @@ -3,5 +3,6 @@ "skip_xcvrd": true, "skip_psud": true, "skip_pcied": true, - "skip_thermalctld": true + "skip_thermalctld": true, + "skip_chassis_db_init": true } diff --git a/device/mellanox/x86_64-mlnx_msn3700_simx-r0/pmon_daemon_control.json b/device/mellanox/x86_64-mlnx_msn3700_simx-r0/pmon_daemon_control.json deleted file mode 100644 index dd83c2db12c5..000000000000 --- a/device/mellanox/x86_64-mlnx_msn3700_simx-r0/pmon_daemon_control.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "skip_ledd": true, - "skip_xcvrd": true, - "skip_psud": true, - "skip_pcied": true, - "skip_thermalctld": true -} diff --git a/device/mellanox/x86_64-mlnx_msn3700_simx-r0/pmon_daemon_control.json b/device/mellanox/x86_64-mlnx_msn3700_simx-r0/pmon_daemon_control.json new file mode 120000 index 000000000000..d9fa54f8d2b9 --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn3700_simx-r0/pmon_daemon_control.json @@ -0,0 +1 @@ +../x86_64-mlnx_msn2700_simx-r0/pmon_daemon_control.json \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn4700_simx-r0/pmon_daemon_control.json b/device/mellanox/x86_64-mlnx_msn4700_simx-r0/pmon_daemon_control.json deleted file mode 100644 index dd83c2db12c5..000000000000 --- a/device/mellanox/x86_64-mlnx_msn4700_simx-r0/pmon_daemon_control.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "skip_ledd": true, - "skip_xcvrd": true, - "skip_psud": true, - "skip_pcied": true, - "skip_thermalctld": true -} diff --git a/device/mellanox/x86_64-mlnx_msn4700_simx-r0/pmon_daemon_control.json b/device/mellanox/x86_64-mlnx_msn4700_simx-r0/pmon_daemon_control.json new file mode 120000 index 000000000000..d9fa54f8d2b9 --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn4700_simx-r0/pmon_daemon_control.json @@ -0,0 +1 @@ +../x86_64-mlnx_msn2700_simx-r0/pmon_daemon_control.json \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn4800_simx-r0/pmon_daemon_control.json b/device/mellanox/x86_64-mlnx_msn4800_simx-r0/pmon_daemon_control.json deleted file mode 100644 index dd83c2db12c5..000000000000 --- a/device/mellanox/x86_64-mlnx_msn4800_simx-r0/pmon_daemon_control.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "skip_ledd": true, - "skip_xcvrd": true, - "skip_psud": true, - "skip_pcied": true, - "skip_thermalctld": true -} diff --git a/device/mellanox/x86_64-mlnx_msn4800_simx-r0/pmon_daemon_control.json b/device/mellanox/x86_64-mlnx_msn4800_simx-r0/pmon_daemon_control.json new file mode 120000 index 000000000000..d9fa54f8d2b9 --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn4800_simx-r0/pmon_daemon_control.json @@ -0,0 +1 @@ +../x86_64-mlnx_msn2700_simx-r0/pmon_daemon_control.json \ No newline at end of file diff --git a/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2 b/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2 index 1bad4ab36731..fb1cdf2caab9 100644 --- a/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2 +++ b/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2 @@ -41,6 +41,7 @@ dependent_startup=true dependent_startup_wait_for=rsyslogd:running {% endif %} +{% if not skip_chassis_db_init %} [program:chassis_db_init] command=/usr/local/bin/chassis_db_init priority=3 @@ -51,6 +52,7 @@ stderr_logfile=syslog startsecs=10 dependent_startup=true dependent_startup_wait_for=rsyslogd:running +{% endif %} {% if not skip_sensors and HAVE_SENSORS_CONF == 1 %} [program:lm-sensors]