Skip to content

Commit a8e5802

Browse files
committed
[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 sonic-net#2655
1 parent b73f9a5 commit a8e5802

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

dockers/docker-teamd/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker-config-engine
1+
FROM docker-config-engine-stretch
22

33
ARG docker_container_name
44
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf

dockers/docker-teamd/start.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ mkdir -p /var/warmboot/teamd
77

88
supervisorctl start rsyslogd
99

10-
supervisorctl start teammgrd
11-
1210
supervisorctl start teamsyncd
11+
12+
supervisorctl start teammgrd

rules/docker-teamd.mk

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
DOCKER_TEAMD = docker-teamd.gz
44
$(DOCKER_TEAMD)_PATH = $(DOCKERS_PATH)/docker-teamd
55
$(DOCKER_TEAMD)_DEPENDS += $(SWSS) $(LIBTEAMDCT) $(LIBTEAM_UTILS) $(REDIS_TOOLS)
6-
$(DOCKER_TEAMD)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
6+
$(DOCKER_TEAMD)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
77
SONIC_DOCKER_IMAGES += $(DOCKER_TEAMD)
88
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_TEAMD)
9+
SONIC_STRETCH_DOCKERS += $(DOCKER_TEAMD)
910

1011
$(DOCKER_TEAMD)_CONTAINER_NAME = teamd
1112
$(DOCKER_TEAMD)_RUN_OPT += --net=host --privileged -t

0 commit comments

Comments
 (0)