del vrrpcfgd

Signed-off-by: philo <philo@micasnetworks.com>
sonic-net · Sep 27, 2024 · 3d4fff0 · 3d4fff0
1 parent 6f417ca
commit 3d4fff0
Show file tree

Hide file tree

Showing 14 changed files with 2 additions and 984 deletions.
diff --git a/dockers/docker-fpm-frr/frr/supervisord/critical_processes.j2 b/dockers/docker-fpm-frr/frr/supervisord/critical_processes.j2
@@ -11,5 +11,4 @@ program:pimd
 program:frrcfgd
 {%- else %}
 program:bgpcfgd
-program:vrrpcfgd
 {%- endif %}
diff --git a/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2 b/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2
@@ -151,17 +151,10 @@ dependent_startup_wait_for=vrrpd:running
 {% if DEVICE_METADATA.localhost.frr_mgmt_framework_config is defined and DEVICE_METADATA.localhost.frr_mgmt_framework_config == "true" %}
 [program:frrcfgd]
 command=/usr/local/bin/frrcfgd
-priority=6
-autostart=false
-autorestart=false
-startsecs=0
-stdout_logfile=syslog
-stderr_logfile=syslog
-dependent_startup=true
-dependent_startup_wait_for=bgpd:running
 {% else %}
 [program:bgpcfgd]
 command=/usr/local/bin/bgpcfgd
+{% endif %}
 priority=6
 autostart=false
 autorestart=false
@@ -171,18 +164,6 @@ stderr_logfile=syslog
 dependent_startup=true
 dependent_startup_wait_for=bgpd:running
 
-[program:vrrpcfgd]
-command=/usr/local/bin/vrrpcfgd
-priority=6
-autostart=false
-autorestart=true
-startsecs=0
-stdout_logfile=syslog
-stderr_logfile=syslog
-dependent_startup=true
-dependent_startup_wait_for=bgpd:running
-{% endif %}
-
 {% if DEVICE_METADATA.localhost.frr_mgmt_framework_config is defined and DEVICE_METADATA.localhost.frr_mgmt_framework_config == "true" %}
 {% else %}
 [program:staticroutebfd]

diff --git a/dockers/docker-orchagent/supervisord.conf.j2 b/dockers/docker-orchagent/supervisord.conf.j2
@@ -302,4 +302,3 @@ dependent_startup_wait_for=swssconfig:exited
 environment=ASAN_OPTIONS="log_path=/var/log/asan/fdbsyncd-asan.log{{ asan_extra_options }}"
 {% endif %}
 {%- endif %}
-
diff --git a/rules/docker-fpm-frr.mk b/rules/docker-fpm-frr.mk
@@ -5,7 +5,7 @@ DOCKER_FPM_FRR = $(DOCKER_FPM_FRR_STEM).gz
 DOCKER_FPM_FRR_DBG = $(DOCKER_FPM_FRR_STEM)-$(DBG_IMAGE_MARK).gz
 
 $(DOCKER_FPM_FRR)_PATH = $(DOCKERS_PATH)/$(DOCKER_FPM_FRR_STEM)
-$(DOCKER_FPM_FRR)_PYTHON_WHEELS += $(SONIC_BGPCFGD) $(SONIC_FRR_MGMT_FRAMEWORK) $(SONIC_VRRPCFGD)
+$(DOCKER_FPM_FRR)_PYTHON_WHEELS += $(SONIC_BGPCFGD) $(SONIC_FRR_MGMT_FRAMEWORK)
 
 $(DOCKER_FPM_FRR)_DEPENDS += $(FRR) $(FRR_SNMP) $(SWSS) $(LIBYANG2) $(SONIC_RSYSLOG_PLUGIN)
 $(DOCKER_FPM_FRR)_DBG_DEPENDS = $($(DOCKER_SWSS_LAYER_BOOKWORM)_DBG_DEPENDS)

diff --git a/rules/sonic_vrrpcfgd.dep b/rules/sonic_vrrpcfgd.dep
diff --git a/rules/sonic_vrrpcfgd.mk b/rules/sonic_vrrpcfgd.mk
diff --git a/src/sonic-vrrpcfgd/.gitignore b/src/sonic-vrrpcfgd/.gitignore
diff --git a/src/sonic-vrrpcfgd/setup.cfg b/src/sonic-vrrpcfgd/setup.cfg
diff --git a/src/sonic-vrrpcfgd/setup.py b/src/sonic-vrrpcfgd/setup.py
diff --git a/src/sonic-vrrpcfgd/tests/__init__.py b/src/sonic-vrrpcfgd/tests/__init__.py
diff --git a/src/sonic-vrrpcfgd/tests/test_config.py b/src/sonic-vrrpcfgd/tests/test_config.py
diff --git a/src/sonic-vrrpcfgd/tests/test_constructor.py b/src/sonic-vrrpcfgd/tests/test_constructor.py
diff --git a/src/sonic-vrrpcfgd/vrrpcfgd/__init__.py b/src/sonic-vrrpcfgd/vrrpcfgd/__init__.py