From a8e58025196dc5f67b505211072b9d761debc39d Mon Sep 17 00:00:00 2001 From: Haiyang Zheng Date: Mon, 1 Apr 2019 22:07:30 +0000 Subject: [PATCH] [teamd] update teamd docker to stretch and fix teamd_init failure * update teamd docker to stretch * teamsyncd should be started before teammgrd, since teamsyncd needs to listen to netlink msgs when portchannel is created by teammgrd https://github.com/Azure/sonic-buildimage/issues/2655 --- dockers/docker-teamd/Dockerfile.j2 | 2 +- dockers/docker-teamd/start.sh | 4 ++-- rules/docker-teamd.mk | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dockers/docker-teamd/Dockerfile.j2 b/dockers/docker-teamd/Dockerfile.j2 index cb749ccf8eae..551608b6fbef 100644 --- a/dockers/docker-teamd/Dockerfile.j2 +++ b/dockers/docker-teamd/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM docker-config-engine +FROM docker-config-engine-stretch ARG docker_container_name RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf diff --git a/dockers/docker-teamd/start.sh b/dockers/docker-teamd/start.sh index 4cbc65ab0cc3..dc4495403c0a 100755 --- a/dockers/docker-teamd/start.sh +++ b/dockers/docker-teamd/start.sh @@ -7,6 +7,6 @@ mkdir -p /var/warmboot/teamd supervisorctl start rsyslogd -supervisorctl start teammgrd - supervisorctl start teamsyncd + +supervisorctl start teammgrd diff --git a/rules/docker-teamd.mk b/rules/docker-teamd.mk index f4a2c7d412df..958957cc9c30 100644 --- a/rules/docker-teamd.mk +++ b/rules/docker-teamd.mk @@ -3,9 +3,10 @@ DOCKER_TEAMD = docker-teamd.gz $(DOCKER_TEAMD)_PATH = $(DOCKERS_PATH)/docker-teamd $(DOCKER_TEAMD)_DEPENDS += $(SWSS) $(LIBTEAMDCT) $(LIBTEAM_UTILS) $(REDIS_TOOLS) -$(DOCKER_TEAMD)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE) +$(DOCKER_TEAMD)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH) SONIC_DOCKER_IMAGES += $(DOCKER_TEAMD) SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_TEAMD) +SONIC_STRETCH_DOCKERS += $(DOCKER_TEAMD) $(DOCKER_TEAMD)_CONTAINER_NAME = teamd $(DOCKER_TEAMD)_RUN_OPT += --net=host --privileged -t