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

[Syncd] containers still based on Stretch must still use Python 2 (#6010)

Browse Source 
Some syncd containers are still based on Debian Stretch, and thus do not have Python 3 available. For these containers, we must still rely on Python 2 to run supervisord_dependent_startup and supervisor-proc-exit-listener.
This commit is contained in:
Joe LeVeque 2020-11-23 22:35:58 -08:00 committed by GitHub
parent 6a6e583b06
commit 80bf8691e8
No account linked to committer's email address
9 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/barefoot/docker-syncd-bfn/supervisord.conf
View File

@ -4,7 +4,7 @@ logfile_backups=2
nodaemon=true nodaemon=true
[eventlistener:dependent-startup] [eventlistener:dependent-startup]
command=python3 -m supervisord_dependent_startup command=python2 -m supervisord_dependent_startup
autostart=true autostart=true
autorestart=unexpected autorestart=unexpected
startretries=0 startretries=0
@ -13,7 +13,7 @@ events=PROCESS_STATE
buffer_size=25 buffer_size=25
[eventlistener:supervisor-proc-exit-listener] [eventlistener:supervisor-proc-exit-listener]
command=/usr/bin/supervisor-proc-exit-listener --container-name syncd command=python2 /usr/bin/supervisor-proc-exit-listener --container-name syncd
events=PROCESS_STATE_EXITED events=PROCESS_STATE_EXITED
autostart=true autostart=true
autorestart=unexpected autorestart=unexpected

4
platform/broadcom/docker-syncd-brcm/supervisord.conf
View File

@ -4,7 +4,7 @@ logfile_backups=2
nodaemon=true nodaemon=true
[eventlistener:dependent-startup] [eventlistener:dependent-startup]
command=python3 -m supervisord_dependent_startup command=python2 -m supervisord_dependent_startup
autostart=true autostart=true
autorestart=unexpected autorestart=unexpected
startretries=0 startretries=0
@ -13,7 +13,7 @@ events=PROCESS_STATE
buffer_size=25 buffer_size=25
[eventlistener:supervisor-proc-exit-listener] [eventlistener:supervisor-proc-exit-listener]
command=/usr/bin/supervisor-proc-exit-listener --container-name syncd command=python2 /usr/bin/supervisor-proc-exit-listener --container-name syncd
events=PROCESS_STATE_EXITED events=PROCESS_STATE_EXITED
autostart=true autostart=true
autorestart=unexpected autorestart=unexpected

4
platform/centec-arm64/docker-syncd-centec/supervisord.conf
View File

@ -4,7 +4,7 @@ logfile_backups=2
nodaemon=true nodaemon=true
[eventlistener:dependent-startup] [eventlistener:dependent-startup]
command=python3 -m supervisord_dependent_startup command=python2 -m supervisord_dependent_startup
autostart=true autostart=true
autorestart=unexpected autorestart=unexpected
startretries=0 startretries=0
@ -13,7 +13,7 @@ events=PROCESS_STATE
buffer_size=25 buffer_size=25
[eventlistener:supervisor-proc-exit-listener] [eventlistener:supervisor-proc-exit-listener]
command=/usr/bin/supervisor-proc-exit-listener --container-name syncd command=python2 /usr/bin/supervisor-proc-exit-listener --container-name syncd
events=PROCESS_STATE_EXITED events=PROCESS_STATE_EXITED
autostart=true autostart=true
autorestart=unexpected autorestart=unexpected

4
platform/centec/docker-syncd-centec/supervisord.conf
View File

@ -4,7 +4,7 @@ logfile_backups=2
nodaemon=true nodaemon=true
[eventlistener:dependent-startup] [eventlistener:dependent-startup]
command=python3 -m supervisord_dependent_startup command=python2 -m supervisord_dependent_startup
autostart=true autostart=true
autorestart=unexpected autorestart=unexpected
startretries=0 startretries=0
@ -12,7 +12,7 @@ exitcodes=0,3
events=PROCESS_STATE events=PROCESS_STATE
[eventlistener:supervisor-proc-exit-listener] [eventlistener:supervisor-proc-exit-listener]
command=/usr/bin/supervisor-proc-exit-listener --container-name syncd command=python2 /usr/bin/supervisor-proc-exit-listener --container-name syncd
events=PROCESS_STATE_EXITED events=PROCESS_STATE_EXITED
autostart=true autostart=true
autorestart=unexpected autorestart=unexpected

2
platform/innovium/docker-syncd-invm/supervisord.conf
View File

@ -4,7 +4,7 @@ logfile_backups=2
nodaemon=true nodaemon=true
[eventlistener:dependent-startup] [eventlistener:dependent-startup]
command=python3 -m supervisord_dependent_startup command=python2 -m supervisord_dependent_startup
autostart=true autostart=true
autorestart=unexpected autorestart=unexpected
startretries=0 startretries=0

4
platform/marvell-arm64/docker-syncd-mrvl/supervisord.conf
View File

@ -4,7 +4,7 @@ logfile_backups=2
nodaemon=true nodaemon=true
[eventlistener:dependent-startup] [eventlistener:dependent-startup]
command=python3 -m supervisord_dependent_startup command=python2 -m supervisord_dependent_startup
autostart=true autostart=true
autorestart=unexpected autorestart=unexpected
startretries=0 startretries=0
@ -13,7 +13,7 @@ events=PROCESS_STATE
buffer_size=25 buffer_size=25
[eventlistener:supervisor-proc-exit-listener] [eventlistener:supervisor-proc-exit-listener]
command=/usr/bin/supervisor-proc-exit-listener --container-name syncd command=python2 /usr/bin/supervisor-proc-exit-listener --container-name syncd
events=PROCESS_STATE_EXITED events=PROCESS_STATE_EXITED
autostart=true autostart=true
autorestart=unexpected autorestart=unexpected

4
platform/marvell-armhf/docker-syncd-mrvl/supervisord.conf
View File

@ -4,7 +4,7 @@ logfile_backups=2
nodaemon=true nodaemon=true
[eventlistener:dependent-startup] [eventlistener:dependent-startup]
command=python3 -m supervisord_dependent_startup command=python2 -m supervisord_dependent_startup
autostart=true autostart=true
autorestart=unexpected autorestart=unexpected
startretries=0 startretries=0
@ -13,7 +13,7 @@ events=PROCESS_STATE
buffer_size=25 buffer_size=25
[eventlistener:supervisor-proc-exit-listener] [eventlistener:supervisor-proc-exit-listener]
command=/usr/bin/supervisor-proc-exit-listener --container-name syncd command=python2 /usr/bin/supervisor-proc-exit-listener --container-name syncd
events=PROCESS_STATE_EXITED events=PROCESS_STATE_EXITED
autostart=true autostart=true
autorestart=unexpected autorestart=unexpected

4
platform/marvell/docker-syncd-mrvl/supervisord.conf
View File

@ -4,7 +4,7 @@ logfile_backups=2
nodaemon=true nodaemon=true
[eventlistener:dependent-startup] [eventlistener:dependent-startup]
command=python3 -m supervisord_dependent_startup command=python2 -m supervisord_dependent_startup
autostart=true autostart=true
autorestart=unexpected autorestart=unexpected
startretries=0 startretries=0
@ -13,7 +13,7 @@ events=PROCESS_STATE
buffer_size=25 buffer_size=25
[eventlistener:supervisor-proc-exit-listener] [eventlistener:supervisor-proc-exit-listener]
command=/usr/bin/supervisor-proc-exit-listener --container-name syncd command=python2 /usr/bin/supervisor-proc-exit-listener --container-name syncd
events=PROCESS_STATE_EXITED events=PROCESS_STATE_EXITED
autostart=true autostart=true
autorestart=unexpected autorestart=unexpected

4
platform/nephos/docker-syncd-nephos/supervisord.conf
View File

@ -4,7 +4,7 @@ logfile_backups=2
nodaemon=true nodaemon=true
[eventlistener:dependent-startup] [eventlistener:dependent-startup]
command=python3 -m supervisord_dependent_startup command=python2 -m supervisord_dependent_startup
autostart=true autostart=true
autorestart=unexpected autorestart=unexpected
startretries=0 startretries=0
@ -13,7 +13,7 @@ events=PROCESS_STATE
buffer_size=25 buffer_size=25
[eventlistener:supervisor-proc-exit-listener] [eventlistener:supervisor-proc-exit-listener]
command=/usr/bin/supervisor-proc-exit-listener --container-name syncd command=python2 /usr/bin/supervisor-proc-exit-listener --container-name syncd
events=PROCESS_STATE_EXITED events=PROCESS_STATE_EXITED
autostart=true autostart=true
autorestart=unexpected autorestart=unexpected