matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[vs]: update virtual switch (#1148)

Browse Source 
* [vs]: add zebra/quagga/fpmsyncd in supervisord.conf

* setup the hostname for vs docker

* do not save to the disk for redis db

* install ipaddress module in vs docker

* update sonic-sairedis submodule
This commit is contained in:
lguohan 2017-11-13 14:38:07 -08:00 committed by GitHub
parent a6edef2fa5
commit 50b4868a99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
platform/vs/docker-sonic-vs/Dockerfile.j2
View File

@ -28,6 +28,9 @@ RUN apt-get install -y net-tools \
iproute \ iproute \
libpython2.7 libpython2.7
RUN pip install setuptools \
py2_ipaddress
COPY \ COPY \
{% for deb in docker_sonic_vs_debs.split(' ') -%} {% for deb in docker_sonic_vs_debs.split(' ') -%}
debs/{{ deb }}{{' '}} debs/{{ deb }}{{' '}}
@ -43,10 +46,12 @@ debs/{{ deb }}{{' '}}
RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
RUN rm -rf /debs RUN rm -rf /debs
RUN sed -ri 's/^daemonize yes$/daemonize no/; \ RUN sed -ri 's/^(save .*$)/# \1/g; \
s/^daemonize yes$/daemonize no/; \
s/^logfile .*$/logfile ""/; \ s/^logfile .*$/logfile ""/; \
s/^# syslog-enabled no$/syslog-enabled no/; \ s/^# syslog-enabled no$/syslog-enabled no/; \
s/^# unixsocket/unixsocket/ \ s/^# unixsocket/unixsocket/; \
s/^client-output-buffer-limit pubsub [0-9]+mb [0-9]+mb [0-9]+/client-output-buffer-limit pubsub 0 0 0/ \
' /etc/redis/redis.conf ' /etc/redis/redis.conf
COPY ["50-default.conf", "/etc/rsyslog.d/"] COPY ["50-default.conf", "/etc/rsyslog.d/"]
@ -54,4 +59,6 @@ COPY ["start.sh", "orchagent.sh", "/usr/bin/"]
COPY ["brcm.profile.ini", "/usr/share/sonic/device/vswitch/"] COPY ["brcm.profile.ini", "/usr/share/sonic/device/vswitch/"]
COPY ["supervisord.conf", "/etc/supervisor/conf.d/"] COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
RUN echo "docker-sonic-vs" > /etc/hostname
ENTRYPOINT ["/usr/bin/supervisord"] ENTRYPOINT ["/usr/bin/supervisord"]

2
platform/vs/docker-sonic-vs/start.sh
View File

@ -28,6 +28,8 @@ supervisorctl start neighsyncd
supervisorctl start teamsyncd supervisorctl start teamsyncd
supervisorctl start fpmsyncd
# Start arp_update when VLAN exists # Start arp_update when VLAN exists
# VLAN=`sonic-cfggen -d -v 'VLAN.keys() | join(" ") if VLAN'` # VLAN=`sonic-cfggen -d -v 'VLAN.keys() | join(" ") if VLAN'`
# if [ "$VLAN" != "" ]; then # if [ "$VLAN" != "" ]; then

24
platform/vs/docker-sonic-vs/supervisord.conf
View File

@ -74,3 +74,27 @@ autostart=false
autorestart=false autorestart=false
stdout_logfile=syslog stdout_logfile=syslog
stderr_logfile=syslog stderr_logfile=syslog
[program:zebra]
command=/usr/lib/quagga/zebra -A 127.0.0.1
priority=10
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog
[program:bgpd]
command=/usr/lib/quagga/bgpd -A 127.0.0.1 -F
priority=11
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog
[program:fpmsyncd]
command=/usr/bin/fpmsyncd
priority=12
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog

2
src/sonic-sairedis

@ -1 +1 @@
Subproject commit f5d9c8364f5fbcc487a5f1a3e3e6203ab2293a83 Subproject commit d11f5501ff15cff7361c397ec937327ce343c94b