From 41dd5fceb838be81a2e019b683c06aef9bfc9add Mon Sep 17 00:00:00 2001 From: Renuka Manavalan Date: Sun, 18 Jun 2023 00:33:40 +0000 Subject: [PATCH] misc --- dockers/docker-device-health/docker_init.sh | 2 +- files/build_templates/init_cfg.json.j2 | 2 +- files/build_templates/sonic_debian_extension.j2 | 4 ++++ slave.mk | 1 - 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dockers/docker-device-health/docker_init.sh b/dockers/docker-device-health/docker_init.sh index 55f397e2bef8..afe585050308 100755 --- a/dockers/docker-device-health/docker_init.sh +++ b/dockers/docker-device-health/docker_init.sh @@ -4,7 +4,7 @@ mkdir -p /etc/supervisor/conf.d/ # Generate supervisord configuration template. -TEMPLATE_FILE="/usr/share/sonic/templates/LoMSupervisord.conf.j2" +TEMPLATE_FILE="/usr/share/sonic/templates/lom.supervisord.conf.j2" PROCS_JSON_FILE="/usr/share/lom/procs.conf.json" SUPERVISORD_FILE="/etc/supervisor/conf.d/LoMSupervisord.conf" diff --git a/files/build_templates/init_cfg.json.j2 b/files/build_templates/init_cfg.json.j2 index e3333701e98c..230db9f69050 100644 --- a/files/build_templates/init_cfg.json.j2 +++ b/files/build_templates/init_cfg.json.j2 @@ -76,7 +76,7 @@ "check_up_status" : "false", {%- endif %} {%- if include_kubernetes == "y" %} -{%- if feature in ["lldp", "pmon", "radv", "eventd", "snmp", "telemetry"] %} +{%- if feature in ["lldp", "pmon", "radv", "eventd", "snmp", "telemetry", "device-health"] %} "set_owner": "kube", {% else %} "set_owner": "local", {% endif %} {% endif %} "high_mem_alert": "disabled" diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2 index 0dc60b2b605f..89600dd45651 100644 --- a/files/build_templates/sonic_debian_extension.j2 +++ b/files/build_templates/sonic_debian_extension.j2 @@ -952,3 +952,7 @@ sudo rm -rf $FILESYSTEM_ROOT/tmp/mask_disabled_services.py sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install python3-dbus + +{% if include_device_health == 'y' %} +sudo mkdir -p /usr/share/device_health +{%- endif %} diff --git a/slave.mk b/slave.mk index 2d73c2c25948..913d5e71ecbd 100644 --- a/slave.mk +++ b/slave.mk @@ -1357,7 +1357,6 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \ $(eval $(docker:-dbg.gz=.gz)_RUN_OPT += $($(docker:-dbg.gz=.gz)_$($*_IMAGE_TYPE)_RUN_OPT)) export docker_image_run_opt="$($(docker:-dbg.gz=.gz)_RUN_OPT)" - $(info "XXX docker yyy" : "$(docker)") if [ -f files/build_templates/$($(docker:-dbg.gz=.gz)_CONTAINER_NAME).service.j2 ]; then j2 files/build_templates/$($(docker:-dbg.gz=.gz)_CONTAINER_NAME).service.j2 > $($(docker:-dbg.gz=.gz)_CONTAINER_NAME).service