Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V1.0.3 backup VLAN trunk implementation #911

Closed
wants to merge 2 commits into from
Closed

V1.0.3 backup VLAN trunk implementation #911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffb6c7c
Start vlan cfg enforcer cfgagent by default.
jipanyang Aug 18, 2017
701241a
Merge remote-tracking branch 'upstream/v1.0.3-backup' into v1.0.3-backup
jipanyang Aug 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions dockers/docker-orchagent/base_image_files/cfgmgr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/bin/bash
docker exec -i swss cfgmgr "$@"
2 changes: 2 additions & 0 deletions dockers/docker-orchagent/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ supervisorctl start rsyslogd

supervisorctl start orchagent

supervisorctl start cfgagentd

supervisorctl start portsyncd

supervisorctl start intfsyncd
Expand Down
8 changes: 8 additions & 0 deletions dockers/docker-orchagent/supervisord.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,11 @@ autostart=false
autorestart=true
stdout_logfile=syslog
stderr_logfile=syslog

[program:cfgagentd]
command=/usr/bin/cfgagentd -d /var/log/swss
priority=9
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog
2 changes: 2 additions & 0 deletions dockers/docker-teamd/teamd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ function start_app {
done
fi
teamsyncd &
redis-cli -n 0 HSET LAG_TABLE:ConfigDone admin_status "up"
}

function clean_up {
Expand All @@ -19,6 +20,7 @@ function clean_up {
done
fi
pkill -9 teamsyncd
redis-cli -n 0 DEL LAG_TABLE:ConfigDone
exit
}

Expand Down
1 change: 1 addition & 0 deletions files/image_config/logrotate/logrotate.d/rsyslog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
/var/log/quagga/zebra.log
/var/log/swss/sairedis.rec
/var/log/swss/swss.rec
/var/log/swss/swss.cfg.rec
{
size 1M
rotate 5000
Expand Down
1 change: 1 addition & 0 deletions platform/broadcom/docker-orchagent-brcm.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ $(DOCKER_ORCHAGENT_BRCM)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
$(DOCKER_ORCHAGENT_BRCM)_RUN_OPT += -v /var/log/swss:/var/log/swss:rw

$(DOCKER_ORCHAGENT_BRCM)_BASE_IMAGE_FILES += swssloglevel:/usr/bin/swssloglevel
$(DOCKER_ORCHAGENT_BRCM)_BASE_IMAGE_FILES += cfgmgr:/usr/bin/cfgmgr
1 change: 1 addition & 0 deletions platform/cavium/docker-orchagent-cavm.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ $(DOCKER_ORCHAGENT_CAVM)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
$(DOCKER_ORCHAGENT_CAVM)_RUN_OPT += -v /var/log/swss:/var/log/swss:rw

$(DOCKER_ORCHAGENT_CAVM)_BASE_IMAGE_FILES += swssloglevel:/usr/bin/swssloglevel
$(DOCKER_ORCHAGENT_BRCM)_BASE_IMAGE_FILES += cfgmgr:/usr/bin/cfgmgr
1 change: 1 addition & 0 deletions platform/centec/docker-orchagent-centec.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ $(DOCKER_ORCHAGENT_CENTEC)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
$(DOCKER_ORCHAGENT_CENTEC)_RUN_OPT += -v /var/log/swss:/var/log/swss:rw

$(DOCKER_ORCHAGENT_CENTEC)_BASE_IMAGE_FILES += swssloglevel:/usr/bin/swssloglevel
$(DOCKER_ORCHAGENT_BRCM)_BASE_IMAGE_FILES += cfgmgr:/usr/bin/cfgmgr
1 change: 1 addition & 0 deletions platform/mellanox/docker-orchagent-mlnx.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ $(DOCKER_ORCHAGENT_MLNX)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
$(DOCKER_ORCHAGENT_MLNX)_RUN_OPT += -v /var/log/swss:/var/log/swss:rw

$(DOCKER_ORCHAGENT_MLNX)_BASE_IMAGE_FILES += swssloglevel:/usr/bin/swssloglevel
$(DOCKER_ORCHAGENT_BRCM)_BASE_IMAGE_FILES += cfgmgr:/usr/bin/cfgmgr
1 change: 1 addition & 0 deletions src/libnl3/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ SHELL = /bin/bash

MAIN_TARGET = libnl-3-200_$(LIBNL3_VERSION)_amd64.deb
DERIVED_TARGETS = libnl-3-dev_$(LIBNL3_VERSION)_amd64.deb \
libnl-3-200-dbg_$(LIBNL3_VERSION)_amd64.deb \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why adding dbg here?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have been seeing issues related to netlink, this to get the dbg file copied to target/debs folder. It makes it easier to find the libnl debug package and install it when needed.

libnl-genl-3-200_$(LIBNL3_VERSION)_amd64.deb \
libnl-genl-3-dev_$(LIBNL3_VERSION)_amd64.deb \
libnl-route-3-200_$(LIBNL3_VERSION)_amd64.deb \
Expand Down