Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Tunnel Manager changes #5843

Merged
merged 9 commits into from
Dec 26, 2020
Merged

Tunnel Manager changes #5843

merged 9 commits into from
Dec 26, 2020

Conversation

prsunny
Copy link
Contributor

@prsunny prsunny commented Nov 6, 2020

- Why I did it
Introduce tunnel manager daemon. Start the process as part of swss container

Submodule update for swss:
9ed3026 - 2020-12-24 : [NAT] ACL Rule with DO_NOT_NAT action is getting failed. (#1502) [Akhilesh Samineni]
c39a4b1 - 2020-12-23 : Mux/IPTunnel orchagent changes (#1497) [Prince Sunny]
bc8df0e - 2020-12-23 : Add support for headroom pool watermark (#1567) [Neetha John]

- How I did it
Changes to supervisord.conf
To be merged after - sonic-net/sonic-swss#1497

- How to verify it

- Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006

- Description for the changelog

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

@prsunny prsunny marked this pull request as ready for review November 26, 2020 00:15
tahmed-dev
tahmed-dev previously approved these changes Dec 1, 2020
tahmed-dev
tahmed-dev previously approved these changes Dec 24, 2020
@lguohan
Copy link
Collaborator

lguohan commented Dec 25, 2020

can you resolve the conflict?

lguohan and others added 2 commits December 25, 2020 03:15
for exmaple, for arm64, the sonic-slave docker image name
is sonic-slave-arm64-$(USER)

for amd64, the docker image is kept as it is

Signed-off-by: Guohan Lu <lguohan@gmail.com>
@lguohan
Copy link
Collaborator

lguohan commented Dec 25, 2020

can you rebase?

@lguohan lguohan merged commit 8fd50e8 into sonic-net:master Dec 26, 2020
@prsunny prsunny deleted the tunnelmgr branch December 27, 2020 18:49
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants