Skip to content
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

[docker-frr] Load frr.conf automatically with split mode #39

Merged
merged 1 commit into from
Feb 10, 2020

Conversation

zhenggen-xu
Copy link
Owner

[docker-frr] Load frr.conf automatically with split mode

Signed-off-by: Zhenggen Xu [email protected]

This should be back-ported to 201911 branch.

- What I did
In case "docker_routing_config_mode": "split", the frr.conf was not loaded automatically today.
This PR is to fix that so it would load the frr.conf automatically

- How I did it
start.sh in docker frr to load the frr.conf automatically

- How to verify it
Before the fix, not frr.conf was loaded. After the fix, frr.conf was loaded.

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

@zhenggen-xu zhenggen-xu merged commit 85380ec into sonic-cfg-mgmt Feb 10, 2020
praveen-li pushed a commit to praveen-li/sonic-buildimage that referenced this pull request Aug 12, 2020
* src/sonic-telemetry fa8d498...3bd7ca3 (4):
  > Update gnmi deps (zhenggen-xu#40)
  > [testdata] Update SFP keys to align with new standard (zhenggen-xu#39)
  > Fixed the parameters for subscribe APIs (zhenggen-xu#38)
  > Azure ro mode (zhenggen-xu#34)

* src/sonic-mgmt-common 444aa9a...cc01ce4 (4):
  > Make gnmi dep version the same as in telemetry repo (zhenggen-xu#17)
  > Cleanup translib and cvl go test cases (zhenggen-xu#13)
  > Package update and enhancements/fixes in YGOT, and Request Binder (zhenggen-xu#12)
  > Translib phase I changes (zhenggen-xu#11)

Note: sonic-telemetry submodule update is dependent upon sonic-mgmt-common submodule update, thus updating both in this patch
zhenggen-xu pushed a commit that referenced this pull request Aug 31, 2020
Point submodule to new 201911 branch of sonic-telemetry and update pointer to the current HEAD of the 201911 branch

* src/sonic-telemetry aaa9188...01b5365 (1):
  > [testdata] Update SFP keys to align with new standard (#39)
praveen-li pushed a commit to praveen-li/sonic-buildimage that referenced this pull request Apr 27, 2021
df46ed418e661a9bccdb2639d8873def356f8ba0 (HEAD -> master, origin/master, origin/HEAD) Fix the LLDP_LOC_CHASSIS not getting populated if no remote neighbors are present (zhenggen-xu#39)
e487532e11cc0e97cfce573b6b997fdd0beeb660 [CI] Set up CI&PR with Azure Pipelines (zhenggen-xu#38)
3c9f488490a1dbded20dbf2d8a88a5ab4dbda8df Replace swsssdk's SonicV2Connector with swsscommon's implementation (zhenggen-xu#35)

Signed-off-by: Abhishek Dosi <[email protected]>
li-pingmao pushed a commit to li-pingmao/sonic-buildimage that referenced this pull request Feb 23, 2022
457e94d51 [macsec_linux]: Fixbug cannot dump the PN due to type error (zhenggen-xu#42)
f7c073323 Disable P2P module (zhenggen-xu#41)
7b3b777e2 [ci]: use native arm64 and armhf build pool (zhenggen-xu#40)
d4e91d66c [sonic_operator]: Increase wait timeout (zhenggen-xu#39)
43611ef88e [sonic_operators]: Add log in sonic operators (zhenggen-xu#43)

Signed-off-by: Ze Gan <[email protected]>
praveen-li pushed a commit to praveen-li/sonic-buildimage that referenced this pull request Aug 9, 2022
f00efef Longxiang Lyu Wed Mar 16 09:12:46 2022 +0800 Add a command line option to store logs into a separate file (zhenggen-xu#41)
ff2e67d Longxiang Lyu Tue Mar 15 09:10:59 2022 +0800 Add default port cable type (zhenggen-xu#39)
ebbb4d8 Jing Zhang Mon Mar 14 15:41:11 2022 -0700 Prevent switching MUX to "Unknown" (zhenggen-xu#36)
c779b8f Longxiang Lyu Thu Mar 10 21:35:11 2022 +0800 [nonfunctional] Use LinkProberStateMachineBase (zhenggen-xu#38)
b9fedd0 Longxiang Lyu Wed Mar 9 13:03:58 2022 +0800 [NONFUNCTIONAL] Add LinkProberStateMachineBase (zhenggen-xu#37)
bedd42b Longxiang Lyu Wed Mar 9 10:03:00 2022 +0800 Add .clang-format file to format code (zhenggen-xu#28)
9fe4fc6 Guohan Lu Thu Mar 3 17:51:43 2022 -0800 [doc]: add lgtm badge in README.md
c1249d9 Longxiang Lyu Wed Mar 2 18:05:18 2022 +0800 Enable lgtm (zhenggen-xu#33)
b8514c6 Longxiang Lyu Wed Mar 2 13:34:39 2022 +0800 Collect port cable type to use corresponding state machine (zhenggen-xu#31)
9b59ef9 Longxiang Lyu Wed Mar 2 07:19:33 2022 +0800 Improve make clean (zhenggen-xu#32)
@zhenggen-xu zhenggen-xu deleted the cfg-mgmt-frr-split branch May 24, 2024 19:06
zhenggen-xu pushed a commit that referenced this pull request May 24, 2024
Why I did it
Update the submodule to include the following fixes

2b33d76 dhcpv6 per interface counter support 
6a6ce24 fix dhcpv6 relay dual tor source interface selection issue 
c36b8e3 [actions] Support Semgrep by Github Actions (#39)
Work item tracking
Microsoft ADO (number only):
How I did it
How to verify it
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant