Revert "check internface status before start bgp (sonic-net#19189)"

This reverts commit 08f8cb6.
wen587 · Aug 19, 2024 · 6051f9a · 6051f9a
1 parent 7e063f7
commit 6051f9a
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 87 deletions.
diff --git a/dockers/docker-fpm-frr/Dockerfile.j2 b/dockers/docker-fpm-frr/Dockerfile.j2
@@ -54,7 +54,6 @@ COPY ["TSC", "/usr/bin/TSC"]
 COPY ["TS", "/usr/bin/TS"]
 COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
 COPY ["zsocket.sh", "/usr/bin/"]
-COPY ["bgpd_wait_for_intf.sh.j2", "/usr/share/sonic/templates/"]
 RUN chmod a+x /usr/bin/TSA && \
     chmod a+x /usr/bin/TSB && \
     chmod a+x /usr/bin/TSC && \

diff --git a/dockers/docker-fpm-frr/bgpd_wait_for_intf.sh.j2 b/dockers/docker-fpm-frr/bgpd_wait_for_intf.sh.j2
diff --git a/dockers/docker-fpm-frr/docker_init.sh b/dockers/docker-fpm-frr/docker_init.sh
@@ -11,7 +11,6 @@ CFGGEN_PARAMS=" \
     -t /usr/share/sonic/templates/supervisord/critical_processes.j2,/etc/supervisor/critical_processes \
     -t /usr/share/sonic/templates/isolate.j2,/usr/sbin/bgp-isolate \
     -t /usr/share/sonic/templates/unisolate.j2,/usr/sbin/bgp-unisolate \
-    -t /usr/share/sonic/templates/bgpd_wait_for_intf.sh.j2,/usr/bin/bgpd_wait_for_intf.sh \
 "
 
 FRR_VARS=$(sonic-cfggen $CFGGEN_PARAMS)
@@ -112,6 +111,4 @@ TZ=$(cat /etc/timezone)
 rm -rf /etc/localtime
 ln -sf /usr/share/zoneinfo/$TZ /etc/localtime
 
-chmod +x /usr/bin/bgpd_wait_for_intf.sh
-
 exec /usr/local/bin/supervisord
diff --git a/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2 b/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2
@@ -76,18 +76,6 @@ dependent_startup=true
 dependent_startup_wait_for=zebra:running
 {% endif %}
 
-[program:bgpd_wait_for_intf]
-command=/usr/bin/bgpd_wait_for_intf.sh
-priority=5
-stopsignal=KILL
-autostart=false
-autorestart=false
-startsecs=0
-stdout_logfile=syslog
-stderr_logfile=syslog
-dependent_startup=true
-dependent_startup_wait_for=zsocket:exited
-
 [program:bgpd]
 command=/usr/lib/frr/bgpd -A 127.0.0.1 -M snmp
 priority=5
@@ -98,7 +86,7 @@ startsecs=0
 stdout_logfile=syslog
 stderr_logfile=syslog
 dependent_startup=true
-dependent_startup_wait_for=bgpd_wait_for_intf:exited
+dependent_startup_wait_for=zsocket:exited
 
 {% if DEVICE_METADATA.localhost.frr_mgmt_framework_config is defined and DEVICE_METADATA.localhost.frr_mgmt_framework_config == "true" %}
 [program:ospfd]