From b19dab4ba5969ce1cfc6495c10250952b094ed2a Mon Sep 17 00:00:00 2001 From: Abhishek Dosi Date: Sun, 9 Aug 2020 12:00:09 -0700 Subject: [PATCH] As part of commit 78c803851c2a30b8f2a39dd8b75bcf345023178d that cherry-pick PR#5081 ICCPD feature got include din 201911 which is not needed so removed it back Signed-off-by: Abhishek Dosi --- files/build_templates/init_cfg.json.j2 | 1 - slave.mk | 1 - 2 files changed, 2 deletions(-) diff --git a/files/build_templates/init_cfg.json.j2 b/files/build_templates/init_cfg.json.j2 index 63d54989f5..af1b4cecc9 100644 --- a/files/build_templates/init_cfg.json.j2 +++ b/files/build_templates/init_cfg.json.j2 @@ -27,7 +27,6 @@ ("swss", "enabled", "enabled"), ("syncd", "enabled", "enabled"), ("teamd", "enabled", "enabled")] %} -{%- if include_iccpd == "y" %}{% do features.append(("iccpd", "disabled", "enabled")) %}{% endif %} {%- if include_mgmt_framework == "y" %}{% do features.append(("mgmt-framework", "enabled", "enabled")) %}{% endif %} {%- if include_nat == "y" %}{% do features.append(("nat", "disabled", "enabled")) %}{% endif %} {%- if include_restapi == "y" %}{% do features.append(("restapi", "disabled", "enabled")) %}{% endif %} diff --git a/slave.mk b/slave.mk index c01657c1d4..0365ca7771 100644 --- a/slave.mk +++ b/slave.mk @@ -663,7 +663,6 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \ export include_nat="$(INCLUDE_NAT)" export include_sflow="$(INCLUDE_SFLOW)" export include_mgmt_framework="$(INCLUDE_MGMT_FRAMEWORK)" - export include_iccpd="$(INCLUDE_ICCPD)" export shutdown_bgp_on_start="$(SHUTDOWN_BGP_ON_START)" export include_kubernetes="$(INCLUDE_KUBERNETES)" export enable_pfcwd_on_start="$(ENABLE_PFCWD_ON_START)"