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

Recognise VXLAN network devices #13419

Merged
merged 2 commits into from Oct 15, 2021
Merged

Recognise VXLAN network devices #13419

merged 2 commits into from Oct 15, 2021

Conversation

manadart
Copy link
Member

When detecting NICs on-machine, we fall back to "ethernet" as the device type for anything that we do not recognise.

Here we ensure that VXLAN, used by the standard ftun0 Fan device is one of the types we recognise and attribute correctly.

QA steps

  • Bootstrap to AWS.
  • Connect to Mongo and run db.linklayerdevices.find().pretty().
  • Check that there is a ftun0 device with type "vxlan".

Documentation changes

None.

Bug reference

N/A

@manadart manadart added the 2.9 label Oct 14, 2021
@manadart
Copy link
Member Author

Copy link
Member

@hmlanigan hmlanigan left a comment

Choose a reason for hiding this comment

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

LGTM - qa went well.

@manadart
Copy link
Member Author

$$merge$$

@jujubot jujubot merged commit d12bc25 into juju:2.9 Oct 15, 2021
@manadart manadart deleted the 2.9-vxlan branch October 15, 2021 06:29
@wallyworld wallyworld mentioned this pull request Oct 19, 2021
jujubot added a commit that referenced this pull request Oct 19, 2021
#13430

Merge 2.9

#13419 Recognise VXLAN network devices
#13423 Fix add-machine command help for zones constraint
#13422 Provision OpenStack instances with NICs for bindings
#13427 Update to latest Pebble
#13429 Fix lease manager next check scheduling
#13428 Various txn fixes mainly for mongo 4.4 compatibility

Conflicts due to mongo changes already in develop
```
# Conflicts:
# cloudconfig/podcfg/image.go
# cloudconfig/podcfg/podcfg.go
# featuretests/upgrade_test.go
# mongo/mongo.go
# testing/mgo.go
#
```

## QA steps

See PRs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
3 participants