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

T6287: Config-sync add the ability to configure API port (backport #3384) #3387

Merged
merged 1 commit into from
May 4, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 1, 2024

Change Summary

Add the ability to configure the API port if the API on the secondary server works on a non-default port.
The primary node will connect to the configured port for config-sync

set service config-sync secondary port '8443'

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes)
  • Migration from an old Vyatta component to vyos-1x, please link to related PR inside obsoleted component
  • Other (please describe):

Related Task(s)

Related PR(s)

Component(s) name

config-sync

Proposed changes

How to test

Configure the secondary node API port (not default)

set service https api keys id KID key 'foo'
set service https port '8443'

On the primary node, use this port to connect to the secondary API for config-sync:

set service config-sync mode 'load'
set service config-sync secondary address '192.168.122.11'
set service config-sync secondary key 'foo'
set service config-sync secondary port '8443'
set service config-sync section protocols ospf

Change anything under protocol ospf on the primary node

vyos@r4# set protocols ospf area 0 network '192.0.2.0/30'
[edit]
vyos@r4# commit
INFO:vyos_config_sync:Config synchronization: Mode=load, Secondary=192.168.122.11
[edit]
vyos@r4# 

Check on the secondary node protocol ospf

vyos@r1-right# show protocols ospf 
 area 0 {
     network 192.0.2.0/30
 }
[edit]
vyos@r1-right# 

Smoketest result

Checklist:

  • I have read the CONTRIBUTING document
  • I have linked this PR to one or more Phabricator Task(s)
  • I have run the components SMOKETESTS if applicable
  • My commit headlines contain a valid Task id
  • My change requires a change to the documentation
  • I have updated the documentation accordingly

This is an automatic backport of pull request #3384 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts label May 1, 2024
Copy link
Contributor Author

mergify bot commented May 1, 2024

Cherry-pick of a7c3f20 has failed:

On branch mergify/bp/sagitta/pr-3384
Your branch is up to date with 'origin/sagitta'.

You are currently cherry-picking commit a7c3f202f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   interface-definitions/service_config-sync.xml.in

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/helpers/vyos_config_sync.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@github-actions github-actions bot added the sagitta VyOS 1.4 LTS label May 1, 2024
@c-po c-po requested review from a team, dmbaturin, sarthurdev, zdc, jestabro, sever-sever and c-po and removed request for a team May 1, 2024 19:29
Copy link
Contributor

@jestabro jestabro left a comment

Choose a reason for hiding this comment

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

This has to wait on the backport of several prerequisites, at which point it will be rebased.

Add the ability to configure the API port if the API on the secondary
server works on a non-default port.
The primary node will connect to configured port for config-sync

```
set service config-sync secondary address '192.0.2.11'
set service config-sync secondary port '8443'
```

(cherry picked from commit a7c3f20)
@jestabro jestabro force-pushed the mergify/bp/sagitta/pr-3384 branch from 65e894b to 57a2962 Compare May 4, 2024 18:08
@jestabro jestabro self-requested a review May 4, 2024 18:08
@c-po c-po merged commit 6fca956 into sagitta May 4, 2024
3 of 4 checks passed
@mergify mergify bot deleted the mergify/bp/sagitta/pr-3384 branch May 4, 2024 19:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
sagitta VyOS 1.4 LTS
Development

Successfully merging this pull request may close these issues.

3 participants