-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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.
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
Add default dhcp_relay.yml file to OneImage build #341
Conversation
@@ -111,6 +111,9 @@ sudo bash -c "echo enabled=false > $FILESYSTEM_ROOT/etc/sonic/updategraph.conf" | |||
# Copy SNMP configuration files | |||
sudo cp $IMAGE_CONFIGS/snmp/snmp.yml $FILESYSTEM_ROOT/etc/sonic/ | |||
|
|||
# Copy initial DHCP relay configuration file, will be overwritten after docker starts |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No I don't think anyone will overwrite this file. This file is the input of config.sh for dhcp relay docker and the real configuration will be generated according to this file.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So until the DHCP servers are stored in the minigraph, this file must be manually edited to contain the actual DHCP server IPs?
@@ -0,0 +1 @@ | |||
dhcp_servers: [] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just to double confirm - have you verified that dhcp relay docker can start correctly with this empty value?
Just discussed offline with Joe - we have agreed that we should embed this information into minigraph. I'll submit another PR for it. |
Abandoning this PR in favor of #374. |
swss: * 13df5a9 2018-09-19 | [cfgmgr]: Add vrfmgrd (sonic-net#621) (HEAD, origin/master, origin/HEAD) [Marian Pritsak] * 54a7c9a 2018-09-18 | [portsorch]: Remove m_ifindex from Port class (sonic-net#624) [Shuotian Cheng] * e765c12 2018-09-17 | [aclorch]: Remove error message when match not found (sonic-net#618) [stepanblyschak] * 07f4cd8 2018-09-14 | Enable vxlan test (sonic-net#620) [pavel-shirshov] * 9fda944 2018-09-14 | Warm reboot: Add support for orchagent pre-shutdown warm-restart state check (sonic-net#562) [Jipan Yang] * 41e61bd 2018-09-14 | Warm reboot: port state sync up (sonic-net#557) [Jipan Yang] * bf38bec 2018-09-14 | [vxlan tunnel]: Don't create encap mapper. Currently not supported (sonic-net#613) [pavel-shirshov] * 528295d 2018-09-14 | [mirrororch]: Remove the queue initialization for different platforms (sonic-net#614) [Shuotian Cheng] * 5af88ab 2018-09-14 | Temporarily disable two test cases to unblock others (sonic-net#617) [Qi Luo] * 60a9d61 2018-09-08 | Support warm-restart for neighsyncd (sonic-net#599) [zhenggen-xu] * 387eac6 2018-09-08 | [mirrororch]: Change Mellanox GRE type to 0x8949 (sonic-net#610) [Shuotian Cheng] * 7114352 2018-09-07 | Store mirror session state in StateDB (sonic-net#609) [Qi Luo] * fa2b5d9 2018-09-06 | [test]: Mark VLAN related mirror test invalid in Debian Jessie (sonic-net#608) [Shuotian Cheng] * 6d40d85 2018-09-06 | [mirrororch]: Fix bug: return false when SAI API call fails (sonic-net#607) [Shuotian Cheng] * cbc5a05 2018-09-05 | [mirrororch]: Enable mirror session destination to point into VLAN (sonic-net#595) [Shuotian Cheng] swss-common: * c6c9a9b 2018-09-19 | Add new macro STATE_FDB_TABLE_NAME (sonic-net#233) (HEAD, origin/master, origin/HEAD) [Qi Luo] * 41b6e18 2018-09-13 | NotificationProducer.send() returns the number of clients that received the message (sonic-net#231) [Qi Luo] sairedis: * 5ef97ca 2018-09-11 | Fix findBridgeVlanForPortVlan for 1Q bridge (sonic-net#345) (HEAD) [Qi Luo] * e402ff6 2018-09-11 | update SAI header (sonic-net#344) [lguohan] * fd75e54 2018-09-11 | sairedis: add while loop to make syncd processEvent() handle as many entries as possible in one event call (sonic-net#335) [Dong Zhang] * 50e1915 2018-08-29 | [misc]: Fix typos (sonic-net#342) [Shuotian Cheng] * 2322375 2018-08-29 | Use syncd -u option (sonic-net#341) [Qi Luo] * 2c2a13c 2018-08-28 | Cleanup usage (sonic-net#340) [Qi Luo] * 7cd75c0 2018-08-26 | [saimeta]: Fix typo: > then -> >; don't exists -> doesn't exist (sonic-net#339) [Shuotian Cheng] Signed-off-by: Guohan Lu <gulv@microsoft.com>
swss: * 13df5a9 2018-09-19 | [cfgmgr]: Add vrfmgrd (#621) (HEAD, origin/master, origin/HEAD) [Marian Pritsak] * 54a7c9a 2018-09-18 | [portsorch]: Remove m_ifindex from Port class (#624) [Shuotian Cheng] * e765c12 2018-09-17 | [aclorch]: Remove error message when match not found (#618) [stepanblyschak] * 07f4cd8 2018-09-14 | Enable vxlan test (#620) [pavel-shirshov] * 9fda944 2018-09-14 | Warm reboot: Add support for orchagent pre-shutdown warm-restart state check (#562) [Jipan Yang] * 41e61bd 2018-09-14 | Warm reboot: port state sync up (#557) [Jipan Yang] * bf38bec 2018-09-14 | [vxlan tunnel]: Don't create encap mapper. Currently not supported (#613) [pavel-shirshov] * 528295d 2018-09-14 | [mirrororch]: Remove the queue initialization for different platforms (#614) [Shuotian Cheng] * 5af88ab 2018-09-14 | Temporarily disable two test cases to unblock others (#617) [Qi Luo] * 60a9d61 2018-09-08 | Support warm-restart for neighsyncd (#599) [zhenggen-xu] * 387eac6 2018-09-08 | [mirrororch]: Change Mellanox GRE type to 0x8949 (#610) [Shuotian Cheng] * 7114352 2018-09-07 | Store mirror session state in StateDB (#609) [Qi Luo] * fa2b5d9 2018-09-06 | [test]: Mark VLAN related mirror test invalid in Debian Jessie (#608) [Shuotian Cheng] * 6d40d85 2018-09-06 | [mirrororch]: Fix bug: return false when SAI API call fails (#607) [Shuotian Cheng] * cbc5a05 2018-09-05 | [mirrororch]: Enable mirror session destination to point into VLAN (#595) [Shuotian Cheng] swss-common: * c6c9a9b 2018-09-19 | Add new macro STATE_FDB_TABLE_NAME (#233) (HEAD, origin/master, origin/HEAD) [Qi Luo] * 41b6e18 2018-09-13 | NotificationProducer.send() returns the number of clients that received the message (#231) [Qi Luo] sairedis: * 5ef97ca 2018-09-11 | Fix findBridgeVlanForPortVlan for 1Q bridge (#345) (HEAD) [Qi Luo] * e402ff6 2018-09-11 | update SAI header (#344) [lguohan] * fd75e54 2018-09-11 | sairedis: add while loop to make syncd processEvent() handle as many entries as possible in one event call (#335) [Dong Zhang] * 50e1915 2018-08-29 | [misc]: Fix typos (#342) [Shuotian Cheng] * 2322375 2018-08-29 | Use syncd -u option (#341) [Qi Luo] * 2c2a13c 2018-08-28 | Cleanup usage (#340) [Qi Luo] * 7cd75c0 2018-08-26 | [saimeta]: Fix typo: > then -> >; don't exists -> doesn't exist (#339) [Shuotian Cheng] Signed-off-by: Guohan Lu <gulv@microsoft.com>
…to print error messages to user; Other minor tweaks (sonic-net#341) - Replace calls to 'click.Abort()' with the Click context method 'fail()' which takes an error message as a parameter in order to ensure descriptive messages are printed rather than simply the message, "Aborted" - Change entrypoint name from 'cli' to 'config' - Rename a couple helper functions for clarity - Replace 'print' calls with 'click.echo()' for consistency - Enhance comments
In case if user does not pass restoration time, it is assumed that queue will be mitigated indefinitely in an event of PFC storm until user disables watchdog on that port. Signed-off-by: marian-pritsak <marianp@mellanox.com>
Signed-off-by: Qi Luo <qiluo-msft@users.noreply.github.com>
platform-daemon: * 88f4b89 2023-01-20 | add data for telemtery enhancement for 'active-active' cable type (sonic-net#332) (HEAD -> 202205) [vdahiya12] platform-common: * ee986fe 2023-01-21 | add SOP ROC in bulk status (sonic-net#341) (HEAD -> 202205) [qinchuanares] Signed-off-by: Ying Xie <ying.xie@microsoft.com>
…3487) platform-daemon: * 88f4b89 2023-01-20 | add data for telemtery enhancement for 'active-active' cable type (#332) (HEAD -> 202205) [vdahiya12] platform-common: * ee986fe 2023-01-21 | add SOP ROC in bulk status (#341) (HEAD -> 202205) [qinchuanares] Signed-off-by: Ying Xie <ying.xie@microsoft.com> Signed-off-by: Ying Xie <ying.xie@microsoft.com>
d0e1ccf - [syseeprom] Remove the trailing space in the value of VENDOR_EXT field in the eepromTlvInfo decode (Add Ingrasys S9100 platform submodule #333) (8 minutes ago) b662bf1 - add SOP ROC in bulk status (Add default dhcp_relay.yml file to OneImage build #341) (17 minutes ago) cdc887c - Don't read AUX_MON_TYPE if memory model is flat ([kernel]: update linux kernel to support z9100 #339) (17 minutes ago) 2236776 - Fix TODO comment ([boardcom]: update saibcm to 2.1.3.1-3 #336) (18 minutes ago) 56397d2 - Removing null characters while decoding from syseeprom ([Makefile]: Automatically rebuild sonic-slave #338) (18 minutes ago) 4651bb0 - [Ci] Upgrade to bullseye and fix the branch reference issue ([platform]: add z9100 platform modules #331) (18 minutes ago) caed733 - Add get_transceiver_status and get_transceiver_pm to API interface (configurations are re-generated across reboots #315) (19 minutes ago) 75d7664 - Use github code scanning instead of LGTM ([platform]: add port_config.ini for dell z9100 #328) (4 weeks ago) 94595a8 - Add warning/critical thresholds for PSU power (Combine alias_map.json with port_config.ini #304) (6 weeks ago)
linkmgrd: * 046bdd0 2023-03-06 | [active-active] add state transition handler for (LinkProber: Unknown, MuxState: Active, LinkState: Down) (sonic-net#179) (HEAD -> 202205) [Jing Zhang] * 15ba715 2023-03-06 | loose link down swithcover condition (sonic-net#178) [Jing Zhang] utilities: * 51d9c9f6 2023-03-06 | [warm/fast-reboot] Backup logs from tmpfs to disk during fast/warm shutdown (sonic-net#2714) (HEAD -> 202205) [Vaibhav Hemant Dixit] * 03aa77b3 2023-03-02 | [ci] Fix pipeline issue caused by sonic-slave-* change. (sonic-net#2709) [Liu Shilong] * 4bd7d4f1 2023-03-03 | [db_migrator] Add missing attribute 'weight' to route entries in APPL DB (sonic-net#2691) [Vaibhav Hemant Dixit] * 69a60397 2023-03-01 | removed duplicates and resolved conflicts (sonic-net#2674) (github/202205) [kannankvs] platform-daemon: * 10bc119 2023-03-06 | [ycable] add changes for correcting telemetry values for 'active-active' (sonic-net#341) (HEAD -> 202205) [vdahiya12] Signed-off-by: Ying Xie <ying.xie@microsoft.com>
Why I did it 6391de0 - [ycable] add changes for correcting telemetry values for 'active-active' (Add default dhcp_relay.yml file to OneImage build #341) (4 hours ago) [vdahiya12] 2cb31c4 - Update CMIS module types for 2x100G AOC support ([kernel]: update linux kernel to support z9100 #339) (4 hours ago) [mihirpat1] 2ea9cf2 - [ycabled] add more coverage to ycabled; add minor name change for vendor API CLI return key-values pairs ([Makefile]: Automatically rebuild sonic-slave #338) (4 hours ago) [vdahiya12] How I did it How to verify it
…#14120) linkmgrd: * 046bdd0 2023-03-06 | [active-active] add state transition handler for (LinkProber: Unknown, MuxState: Active, LinkState: Down) (#179) (HEAD -> 202205) [Jing Zhang] * 15ba715 2023-03-06 | loose link down swithcover condition (#178) [Jing Zhang] utilities: * 51d9c9f6 2023-03-06 | [warm/fast-reboot] Backup logs from tmpfs to disk during fast/warm shutdown (#2714) (HEAD -> 202205) [Vaibhav Hemant Dixit] * 03aa77b3 2023-03-02 | [ci] Fix pipeline issue caused by sonic-slave-* change. (#2709) [Liu Shilong] * 4bd7d4f1 2023-03-03 | [db_migrator] Add missing attribute 'weight' to route entries in APPL DB (#2691) [Vaibhav Hemant Dixit] * 69a60397 2023-03-01 | removed duplicates and resolved conflicts (#2674) (github/202205) [kannankvs] platform-daemon: * 10bc119 2023-03-06 | [ycable] add changes for correcting telemetry values for 'active-active' (#341) (HEAD -> 202205) [vdahiya12] Signed-off-by: Ying Xie <ying.xie@microsoft.com>
Update sonic-platform-daemons submodule pointer to include the following: * 03374b2 [ycable] add changes for correcting telemetry values for 'active-active' ([sonic-net#341](sonic-net/sonic-platform-daemons#341)) Signed-off-by: AntonHryshchuk <antonh@nvidia.com>
* add SOP ROC in bulk status * add test item
Wait till CHASIS_APP_DB PING is successful, host_name and asic_name …
Fixes #330.