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

Combining Repos #36

Merged
merged 38 commits into from
Aug 6, 2020
Merged

Combining Repos #36

merged 38 commits into from
Aug 6, 2020

Conversation

nertwork
Copy link
Collaborator

The repos have been out of sync for a little while. We've added a lot of functionality in the downstream repo and would like to merge this into this project. Let me know if you have any tips or pointers to getting this done.

Ian Clark and others added 30 commits August 28, 2019 22:35
fix so neighbor is activated on address family
fixing ipv6 static route bug
adding forwarding and neighbor options
Merge pull request #38 from floored1585/readme
ensuring is_peer_group is set before accessed
we need to manage vtysh.conf
prevent empty list items from iterating
This resolves the issue where iteritems() becomes items() in python3.
This is to support python3 fully as python 2.7 is EOL starting Jan
1, 2020.
FRR has provided an apt repo for Debian based systems. This allows for
an easier install/upgrade path and the existing provisioning has moved
to debian_legacy where the new apt install has been created in
tasks/debian
drwahl and others added 3 commits December 11, 2019 13:18
Installs python-frrtools as part of the frr install
Right now the Focal distribution has the most recent FRR. The FRR repos
do not support Focal currently, so to get this role to work we must use
the default repo for now.
@mrlesmithjr
Copy link
Owner

Oh man. This is going to be fun. I'd first start with a rebase from this repo's master branch. Then walk through the conflicts one by one choosing the correct change from the conflict. Then test to ensure things look good from your testing as well. I'd also recommend opening up a collaborative review amongst the other users to see how things might affect them as well. I personally have not used this role in quite some time. I really appreciate all of your hard work as well. 👍

oddomatik and others added 5 commits July 2, 2020 13:45
debian.yml includes the exact logic needed to deploy frr 7+ with bionic. There very well could be a better and more specific way to address this issue, but bionic does not like debian_legacy due to the specific version definition contained within.
Bionic should include debian.yml
Features:
 - quagga configration (via routing_type var)
 - quagga configuration documentation
Bug Fixes:
 - redistribute_v6 is fixed
Allows for Quagga to be configured
Copy link
Collaborator

@elcomtik elcomtik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I reviewed the proposed changes. It looks ok to me. I would vote for merging

@elcomtik elcomtik mentioned this pull request Aug 5, 2020
Copy link
Owner

@mrlesmithjr mrlesmithjr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good

@mrlesmithjr
Copy link
Owner

@elcomtik @nertwork Looks like there is a conflict that needs to be resolved. Can you look into this?

@elcomtik
Copy link
Collaborator

elcomtik commented Aug 5, 2020

@elcomtik @nertwork Looks like there is a conflict that needs to be resolved. Can you look into this?

I can't, resolve conflicts in this PR, so i resolved it in new PR #39

@mrlesmithjr mrlesmithjr merged commit c82a302 into mrlesmithjr:master Aug 6, 2020
@elcomtik elcomtik mentioned this pull request Aug 6, 2020
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.

None yet

6 participants