matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
08dc00f817
sonic-buildimage/dockers/docker-iccpd/iccpd.j2

12 lines
367 B
Plaintext
Raw Normal View History

MCLAG feature for SONIC (#2514) * MCLAG feature for sonic * MCLAG feature for sonic * remove binary file * remove unused dockerfile update docker-iccpd to stretch-based container Signed-off-by: shine.chen <shine.chen@nephosinc.com> * minor fix for isolation port setting Signed-off-by: shine.chen <shine.chen@nephosinc.com> * iccpd docker would start on demand Signed-off-by: shine.chen <shine.chen@nephosinc.com> * Add x attribute on mclagdctl file Signed-off-by: shine.chen <shine.chen@nephosinc.com> * add warm-reboot support for MCLAG Signed-off-by: shine.chen <shine.chen@nephosinc.com> * merge to master branch and reformat iccpd file Signed-off-by: shine.chen <shine.chen@nephosinc.com> * fix some bugs and make peer-link configuration optional Signed-off-by: shine.chen <shine.chen@nephosinc.com> * refactor code per Brcm review Signed-off-by: shine.chen <shine.chen@nephosinc.com> * correct a typo Signed-off-by: shine.chen <shine.chen@nephosinc.com> * * optimize iccpd arp/mac sync process * refine code according to brcm opinoin * unify function return value Signed-off-by: shine.chen <shine.chen@nephosinc.com> * * optimize warm-reboot process * estabish iccpd connection with configurated src-ip Signed-off-by: shine.chen <shine.chen@nephosinc.com> * fix a typo Signed-off-by: shine.chen <shine.chen@nephosinc.com> * optimize some code * add some debug info * optimize bridge mac setting * fix vlan mac sync issue on standby node Signed-off-by: shine.chen <shine.chen@mediatek.com> * optimize some code Signed-off-by: shine.chen <shine.chen@mediatek.com> * fix some bugs for warm-reboot Signed-off-by: shine.chen <shine.chen@mediatek.com> * refine log level Signed-off-by: shine.chen <shine.chen@mediatek.com> * refine iccpd syslog & skip arp packet whose src ip is local ip Signed-off-by: shine.chen <shine.chen@mediatek.com> * remove iccpd dependency with teamd Signed-off-by: shine.chen <shine.chen@mediatek.com> * print log level when dump mclag status Signed-off-by: shine.chen <shine.chen@mediatek.com> * revise per community review Signed-off-by: shine.chen <shine.chen@mediatek.com> Co-authored-by: shine.chen <shine.chen@nephosinc.com> Co-authored-by: shine.chen <shine.chen@mediatek.com>
2020-04-04 17:24:06 -05:00
{% for mclag_id in MC_LAG %}
mclag_id:{{mclag_id}}
local_ip:{{MC_LAG[mclag_id]['local_ip']}}
peer_ip:{{MC_LAG[mclag_id]['peer_ip']}}
[iccpd][docker] fix initial startup configuration (#7982) #### Why I did it The process of config generation (sonic-cfggen) fails, but the services continue to run with invalid config #### How I did it * add exit with error on errors in start.sh script (because supervisord relies on start.sh return code). * fix jinja template. Jinja use common python expressions under the hood and `has_key` method was removed from dict in py3, so use check by `in` operator as it is supported by both py2 and py3. #### How to verify it * compile sonic with enabled iccp. * add mclag config to CONFIG_DB. ``` 'MC_LAG|1' => { "local_ip": "10.0.0.2", "peer_ip": "10.0.0.3", "peer_link": "Ethernet8", "mclag_interface": "Ethernet12" } * unmaks, enable and start swss and iccpd services in sonic. * log in into the iccpd container and check the config file `/etc/iccpd/iccpd.conf` * expected config: ``` mclag_id:1 local_ip:10.0.0.2 peer_ip:10.0.0.3 peer_link:Ethernet8 mclag_interface:Ethernet12 system_mac:YOUR_SYSTEM_MAC #### Description for the changelog Fixed initial iccpd startup configuration.
2021-07-01 02:47:26 -05:00
{% if 'peer_link' in MC_LAG[mclag_id] %}
MCLAG feature for SONIC (#2514) * MCLAG feature for sonic * MCLAG feature for sonic * remove binary file * remove unused dockerfile update docker-iccpd to stretch-based container Signed-off-by: shine.chen <shine.chen@nephosinc.com> * minor fix for isolation port setting Signed-off-by: shine.chen <shine.chen@nephosinc.com> * iccpd docker would start on demand Signed-off-by: shine.chen <shine.chen@nephosinc.com> * Add x attribute on mclagdctl file Signed-off-by: shine.chen <shine.chen@nephosinc.com> * add warm-reboot support for MCLAG Signed-off-by: shine.chen <shine.chen@nephosinc.com> * merge to master branch and reformat iccpd file Signed-off-by: shine.chen <shine.chen@nephosinc.com> * fix some bugs and make peer-link configuration optional Signed-off-by: shine.chen <shine.chen@nephosinc.com> * refactor code per Brcm review Signed-off-by: shine.chen <shine.chen@nephosinc.com> * correct a typo Signed-off-by: shine.chen <shine.chen@nephosinc.com> * * optimize iccpd arp/mac sync process * refine code according to brcm opinoin * unify function return value Signed-off-by: shine.chen <shine.chen@nephosinc.com> * * optimize warm-reboot process * estabish iccpd connection with configurated src-ip Signed-off-by: shine.chen <shine.chen@nephosinc.com> * fix a typo Signed-off-by: shine.chen <shine.chen@nephosinc.com> * optimize some code * add some debug info * optimize bridge mac setting * fix vlan mac sync issue on standby node Signed-off-by: shine.chen <shine.chen@mediatek.com> * optimize some code Signed-off-by: shine.chen <shine.chen@mediatek.com> * fix some bugs for warm-reboot Signed-off-by: shine.chen <shine.chen@mediatek.com> * refine log level Signed-off-by: shine.chen <shine.chen@mediatek.com> * refine iccpd syslog & skip arp packet whose src ip is local ip Signed-off-by: shine.chen <shine.chen@mediatek.com> * remove iccpd dependency with teamd Signed-off-by: shine.chen <shine.chen@mediatek.com> * print log level when dump mclag status Signed-off-by: shine.chen <shine.chen@mediatek.com> * revise per community review Signed-off-by: shine.chen <shine.chen@mediatek.com> Co-authored-by: shine.chen <shine.chen@nephosinc.com> Co-authored-by: shine.chen <shine.chen@mediatek.com>
2020-04-04 17:24:06 -05:00
peer_link:{{MC_LAG[mclag_id]['peer_link']}}
{% endif %}
mclag_interface:{{MC_LAG[mclag_id]['mclag_interface']}}
{% endfor %}
system_mac:{{DEVICE_METADATA['localhost']['mac']}}
Reference in New Issue Copy Permalink