311045f01f
virtual-chassis test uses multiple vs instances to simulate a modular switch and a redis-chassis service is required to run on the vs instance that represents a supervisor card. This change allows vs docker start redis-chassis service according to external config file. **- Why I did it** To support virtual-chassis setup, so that we can test distributed forwarding feature in virtual sonic environment, see `Distributed forwarding in a VOQ architecture HLD` pull request at https://github.com/Azure/SONiC/pull/622 **- How I did it** The sonic-vs start.sh is enhanced to start new redis_chassis service if external chassis config file found. The config file doesn't exist in current vs environment, start.sh will behave like before. **- How to verify it** The swss/test still pass. The chassis_db service is verified in virtual-chassis topology and tests which are in following PRs. Signed-off-by: Honggang Xu <hxu@arista.com> (cherry picked from commit c1d45cf81ce3238be2dcbccae98c0780944981ce) Co-authored-by: Honggang Xu <hxu@arista.com>
45 lines
1.6 KiB
Makefile
45 lines
1.6 KiB
Makefile
# docker image for virtual switch based sonic docker image
|
|
|
|
DOCKER_SONIC_VS = docker-sonic-vs.gz
|
|
$(DOCKER_SONIC_VS)_PATH = $(PLATFORM_PATH)/docker-sonic-vs
|
|
$(DOCKER_SONIC_VS)_DEPENDS += $(SWSS) \
|
|
$(SYNCD_VS) \
|
|
$(PYTHON_SWSSCOMMON) \
|
|
$(LIBTEAMDCTL) \
|
|
$(LIBTEAM_UTILS) \
|
|
$(SONIC_DEVICE_DATA) \
|
|
$(LIBYANG) \
|
|
$(LIBYANG_CPP) \
|
|
$(LIBYANG_PY2)
|
|
|
|
$(DOCKER_SONIC_VS)_PYTHON_DEBS += $(SONIC_UTILS)
|
|
|
|
$(DOCKER_SONIC_VS)_PYTHON_WHEELS += $(SONIC_YANG_MODELS_PY3)
|
|
$(DOCKER_SONIC_VS)_PYTHON_WHEELS += $(SONIC_YANG_MGMT_PY)
|
|
|
|
ifeq ($(INSTALL_DEBUG_TOOLS), y)
|
|
$(DOCKER_SONIC_VS)_DEPENDS += $(SWSS_DBG) \
|
|
$(LIBSWSSCOMMON_DBG) \
|
|
$(LIBSAIREDIS_DBG) \
|
|
$(LIBSAIVS_DBG) \
|
|
$(SYNCD_VS_DBG)
|
|
endif
|
|
|
|
ifeq ($(SONIC_ROUTING_STACK), quagga)
|
|
$(DOCKER_SONIC_VS)_DEPENDS += $(QUAGGA)
|
|
else ifeq ($(SONIC_ROUTING_STACK), frr)
|
|
$(DOCKER_SONIC_VS)_DEPENDS += $(FRR)
|
|
else
|
|
$(DOCKER_SONIC_VS)_DEPENDS += $(GOBGP)
|
|
endif
|
|
|
|
$(DOCKER_SONIC_VS)_FILES += $(CONFIGDB_LOAD_SCRIPT) \
|
|
$(ARP_UPDATE_SCRIPT) \
|
|
$(BUFFERS_CONFIG_TEMPLATE) \
|
|
$(QOS_CONFIG_TEMPLATE) \
|
|
$(SONIC_VERSION) \
|
|
$(RM_CHASSISDB_CONFIG_SCRIPT)
|
|
|
|
$(DOCKER_SONIC_VS)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BUSTER)
|
|
SONIC_DOCKER_IMAGES += $(DOCKER_SONIC_VS)
|