misc

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"
 

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"

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 %}

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