[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
hzheng5 · Apr 1, 2019 · a8e5802 · a8e5802
1 parent b73f9a5
commit a8e5802
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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