Skip to content

Commit

Permalink
[SAIServer] sai server reads config from hwsku folder (#8625)
Browse files Browse the repository at this point in the history
To enable saiserver docker on different platforms, it needs different configuration files. make the saiserver docker mount them in hwsku folder.

Co-authored-by: Ubuntu <richardyu@richardyu-ubuntu-vm0.trsxrdzozv2e1czsze2t05vqzh.ix.internal.cloudapp.net>
  • Loading branch information
richardyu-ms and Ubuntu authored Sep 2, 2021
1 parent 112fda7 commit 058f975
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 37 deletions.
2 changes: 0 additions & 2 deletions platform/broadcom/docker-saiserver-brcm/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ RUN apt-get install -yf kmod
COPY ["files/dsserve", "files/bcmcmd", "start.sh", "bcmsh", "/usr/bin/"]
RUN chmod +x /usr/bin/dsserve /usr/bin/bcmcmd

COPY ["profile.ini", "portmap.ini", "/etc/sai/"]

COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]

## Clean up
Expand Down
33 changes: 0 additions & 33 deletions platform/broadcom/docker-saiserver-brcm/portmap.ini

This file was deleted.

1 change: 0 additions & 1 deletion platform/broadcom/docker-saiserver-brcm/profile.ini

This file was deleted.

2 changes: 1 addition & 1 deletion platform/broadcom/docker-saiserver-brcm/supervisord.conf
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ stdout_logfile=syslog
stderr_logfile=syslog

[program:saiserver]
command=/usr/sbin/saiserver -p /etc/sai/profile.ini -f /etc/sai/portmap.ini
command=/usr/sbin/saiserver -p /usr/share/sonic/hwsku/sai.profile -f /usr/share/sonic/hwsku/port_config.ini
priority=3
autostart=false
autorestart=false
Expand Down

0 comments on commit 058f975

Please sign in to comment.