From 74b00845e56f16294df5cdf69982a63ba8e3a7c4 Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Mon, 2 Sep 2024 09:20:03 -0700 Subject: [PATCH] Revert "[boot] Refactor: All services which start Docker containers start before ntp-config service (#2335)" Supervisor now handles the case where the time jumps back, now that supervisor/supervisor#1047 has been merged. This reverts commit 298d2ad8f47facf751467e8d3f828a483c23e086. --- files/build_templates/dhcp_relay.service.j2 | 1 - files/build_templates/gnmi.service.j2 | 1 - files/build_templates/lldp.service.j2 | 1 - files/build_templates/mgmt-framework.service.j2 | 1 - files/build_templates/nat.service.j2 | 1 - files/build_templates/p4rt.service.j2 | 1 - files/build_templates/per_namespace/bgp.service.j2 | 1 - files/build_templates/per_namespace/gbsyncd.service.j2 | 1 - files/build_templates/per_namespace/lldp.service.j2 | 1 - files/build_templates/per_namespace/swss.service.j2 | 1 - files/build_templates/per_namespace/syncd.service.j2 | 1 - files/build_templates/per_namespace/teamd.service.j2 | 1 - files/build_templates/pmon.service.j2 | 1 - files/build_templates/radv.service.j2 | 1 - files/build_templates/restapi.service.j2 | 1 - files/build_templates/sflow.service.j2 | 1 - files/build_templates/snmp.service.j2 | 1 - files/build_templates/telemetry.service.j2 | 1 - rules/docker-dhcp-relay.mk | 1 - 19 files changed, 19 deletions(-) delete mode 120000 files/build_templates/lldp.service.j2 diff --git a/files/build_templates/dhcp_relay.service.j2 b/files/build_templates/dhcp_relay.service.j2 index d87186e4dce1..bd99940ab15c 100644 --- a/files/build_templates/dhcp_relay.service.j2 +++ b/files/build_templates/dhcp_relay.service.j2 @@ -4,7 +4,6 @@ Requires=config-setup.service After=config-setup.service swss.service syncd.service teamd.service BindsTo=sonic.target After=sonic.target -Before=ntp-config.service StartLimitIntervalSec=1200 StartLimitBurst=3 diff --git a/files/build_templates/gnmi.service.j2 b/files/build_templates/gnmi.service.j2 index 7710a8fd0d04..3959640131c0 100644 --- a/files/build_templates/gnmi.service.j2 +++ b/files/build_templates/gnmi.service.j2 @@ -2,7 +2,6 @@ Description=GNMI container Requires=database.service After=database.service swss.service syncd.service -Before=ntp-config.service BindsTo=sonic.target After=sonic.target StartLimitIntervalSec=1200 diff --git a/files/build_templates/lldp.service.j2 b/files/build_templates/lldp.service.j2 deleted file mode 120000 index 1adb318b9154..000000000000 --- a/files/build_templates/lldp.service.j2 +++ /dev/null @@ -1 +0,0 @@ -per_namespace/lldp.service.j2 \ No newline at end of file diff --git a/files/build_templates/mgmt-framework.service.j2 b/files/build_templates/mgmt-framework.service.j2 index ff99afe62bc1..b6b6968210da 100644 --- a/files/build_templates/mgmt-framework.service.j2 +++ b/files/build_templates/mgmt-framework.service.j2 @@ -4,7 +4,6 @@ Requires=database.service After=database.service swss.service syncd.service BindsTo=sonic.target After=sonic.target -Before=ntp-config.service [Service] User={{ sonicadmin_user }} diff --git a/files/build_templates/nat.service.j2 b/files/build_templates/nat.service.j2 index 095bcd40cf4a..507c6de76d15 100644 --- a/files/build_templates/nat.service.j2 +++ b/files/build_templates/nat.service.j2 @@ -4,7 +4,6 @@ Requires=config-setup.service After=config-setup.service swss.service syncd.service BindsTo=sonic.target After=sonic.target -Before=ntp-config.service StartLimitIntervalSec=1200 StartLimitBurst=3 diff --git a/files/build_templates/p4rt.service.j2 b/files/build_templates/p4rt.service.j2 index b4adce5332d1..5a06a02c2156 100644 --- a/files/build_templates/p4rt.service.j2 +++ b/files/build_templates/p4rt.service.j2 @@ -4,7 +4,6 @@ Requires=database.service After=database.service swss.service BindsTo=sonic.target After=sonic.target -Before=ntp-config.service StartLimitIntervalSec=1200 StartLimitBurst=3 diff --git a/files/build_templates/per_namespace/bgp.service.j2 b/files/build_templates/per_namespace/bgp.service.j2 index 52d7d1084606..2b8497265bc5 100644 --- a/files/build_templates/per_namespace/bgp.service.j2 +++ b/files/build_templates/per_namespace/bgp.service.j2 @@ -6,7 +6,6 @@ Requires=config-setup.service After=config-setup.service BindsTo=sonic.target After=sonic.target -Before=ntp-config.service After=swss{% if multi_instance == 'true' %}@%i{% endif %}.service After=interfaces-config.service StartLimitIntervalSec=1200 diff --git a/files/build_templates/per_namespace/gbsyncd.service.j2 b/files/build_templates/per_namespace/gbsyncd.service.j2 index 7a6de8c7d1e9..876161c65dfe 100644 --- a/files/build_templates/per_namespace/gbsyncd.service.j2 +++ b/files/build_templates/per_namespace/gbsyncd.service.j2 @@ -7,7 +7,6 @@ After=interfaces-config.service After=swss{% if multi_instance == 'true' %}@%i{% endif %}.service BindsTo=sonic.target After=sonic.target -Before=ntp-config.service [Service] User=root diff --git a/files/build_templates/per_namespace/lldp.service.j2 b/files/build_templates/per_namespace/lldp.service.j2 index 95d938472ea2..ac8f4ae7661a 100644 --- a/files/build_templates/per_namespace/lldp.service.j2 +++ b/files/build_templates/per_namespace/lldp.service.j2 @@ -10,7 +10,6 @@ BindsTo=sonic.target After=sonic.target BindsTo=sonic.target After=sonic.target -Before=ntp-config.service StartLimitIntervalSec=1200 StartLimitBurst=3 diff --git a/files/build_templates/per_namespace/swss.service.j2 b/files/build_templates/per_namespace/swss.service.j2 index b0560aabc57a..9e07f78d79d2 100644 --- a/files/build_templates/per_namespace/swss.service.j2 +++ b/files/build_templates/per_namespace/swss.service.j2 @@ -13,7 +13,6 @@ Requires=config-setup.service After=config-setup.service BindsTo=sonic.target After=sonic.target -Before=ntp-config.service StartLimitIntervalSec=1200 StartLimitBurst=3 diff --git a/files/build_templates/per_namespace/syncd.service.j2 b/files/build_templates/per_namespace/syncd.service.j2 index 842eaebc756e..5a3e4891a3b2 100644 --- a/files/build_templates/per_namespace/syncd.service.j2 +++ b/files/build_templates/per_namespace/syncd.service.j2 @@ -18,7 +18,6 @@ Requires=config-setup.service After=config-setup.service BindsTo=sonic.target After=sonic.target -Before=ntp-config.service {% if sonic_asic_platform == 'mellanox' %} Requires=nv-syncd-shared.service After=nv-syncd-shared.service diff --git a/files/build_templates/per_namespace/teamd.service.j2 b/files/build_templates/per_namespace/teamd.service.j2 index ddf6691eae98..2ec784a483fd 100644 --- a/files/build_templates/per_namespace/teamd.service.j2 +++ b/files/build_templates/per_namespace/teamd.service.j2 @@ -9,7 +9,6 @@ Requires=config-setup.service After=config-setup.service BindsTo=sonic.target After=sonic.target -Before=ntp-config.service StartLimitIntervalSec=1200 StartLimitBurst=3 diff --git a/files/build_templates/pmon.service.j2 b/files/build_templates/pmon.service.j2 index b2cd75ac70a9..75a997ce2580 100644 --- a/files/build_templates/pmon.service.j2 +++ b/files/build_templates/pmon.service.j2 @@ -7,7 +7,6 @@ After=syncd.service {% endif %} BindsTo=sonic.target After=sonic.target -Before=ntp-config.service StartLimitIntervalSec=1200 StartLimitBurst=3 diff --git a/files/build_templates/radv.service.j2 b/files/build_templates/radv.service.j2 index 4c414a83c386..4205abc0aa3a 100644 --- a/files/build_templates/radv.service.j2 +++ b/files/build_templates/radv.service.j2 @@ -2,7 +2,6 @@ Description=Router advertiser container Requires=config-setup.service After=config-setup.service swss.service syncd.service -Before=ntp-config.service BindsTo=sonic.target After=sonic.target StartLimitIntervalSec=1200 diff --git a/files/build_templates/restapi.service.j2 b/files/build_templates/restapi.service.j2 index c82510238a83..49d436193ec9 100644 --- a/files/build_templates/restapi.service.j2 +++ b/files/build_templates/restapi.service.j2 @@ -4,7 +4,6 @@ Requires=config-setup.service After=config-setup.service BindsTo=sonic.target After=sonic.target -Before=ntp-config.service [Service] User={{ sonicadmin_user }} diff --git a/files/build_templates/sflow.service.j2 b/files/build_templates/sflow.service.j2 index b83e7e594be7..5c78311a2523 100644 --- a/files/build_templates/sflow.service.j2 +++ b/files/build_templates/sflow.service.j2 @@ -4,7 +4,6 @@ Requisite=swss.service After=swss.service syncd.service hostcfgd.service interfaces-config.service BindsTo=sonic.target After=sonic.target -Before=ntp-config.service StartLimitIntervalSec=1200 StartLimitBurst=3 diff --git a/files/build_templates/snmp.service.j2 b/files/build_templates/snmp.service.j2 index db3ac1907f6c..3b608d6e332a 100644 --- a/files/build_templates/snmp.service.j2 +++ b/files/build_templates/snmp.service.j2 @@ -5,7 +5,6 @@ Requisite=swss.service After=config-setup.service swss.service syncd.service interfaces-config.service BindsTo=sonic.target After=sonic.target -Before=ntp-config.service StartLimitIntervalSec=1200 StartLimitBurst=3 diff --git a/files/build_templates/telemetry.service.j2 b/files/build_templates/telemetry.service.j2 index ebdd484dc877..97b622fc67c3 100644 --- a/files/build_templates/telemetry.service.j2 +++ b/files/build_templates/telemetry.service.j2 @@ -2,7 +2,6 @@ Description=Telemetry container Requires=database.service After=database.service swss.service syncd.service -Before=ntp-config.service BindsTo=sonic.target After=sonic.target StartLimitIntervalSec=1200 diff --git a/rules/docker-dhcp-relay.mk b/rules/docker-dhcp-relay.mk index 6462b4d41165..2bc675a74948 100644 --- a/rules/docker-dhcp-relay.mk +++ b/rules/docker-dhcp-relay.mk @@ -25,7 +25,6 @@ $(DOCKER_DHCP_RELAY)_PACKAGE_DEPENDS = database^1.0.0 $(DOCKER_DHCP_RELAY)_SERVICE_REQUIRES = config-setup $(DOCKER_DHCP_RELAY)_SERVICE_AFTER = swss syncd teamd -$(DOCKER_DHCP_RELAY)_SERVICE_BEFORE = ntp-config $(DOCKER_DHCP_RELAY)_SERVICE_DEPENDENT_OF = swss SONIC_DOCKER_IMAGES += $(DOCKER_DHCP_RELAY)