Merge ~smakar/cloud-init:bond0_issue into cloud-init:master

Proposed by Stanislav Makar
Status: Merged
Approved by: Ryan Harper
Approved revision: 1084a51a4e62e0434f44753e5269963957fa7fa8
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~smakar/cloud-init:bond0_issue
Merge into: cloud-init:master
Diff against target: 13 lines (+2/-0)
1 file modified
cloudinit/net/__init__.py (+2/-0)
Reviewer Review Type Date Requested Status
Ryan Harper Approve
Server Team CI bot continuous-integration Approve
Dan Watkins Needs Information
Review via email: mp+362105@code.launchpad.net

Commit message

net: skip bond interfaces in get_interfaces

bonds may inherit mac address from a physical interface

LP: #1812857

To post a comment you must log in.
Revision history for this message
Dan Watkins (oddbloke) wrote :

Hi Stanislav,

Thank you for contributing to cloud-init.

To contribute, you must sign the Canonical Contributor License Agreement
(CLA) [1].

If you have already signed it as an individual, your Launchpad user will
be listed in the contributor-agreement-canonical launchpad group [2].
Unfortunately there is no easy way to check if an organization or company
you are doing work for has signed. If you are unsure or have questions,
email <email address hidden> or ping powersj in #cloud-init channel
via freenode.

For information on how to sign, please see the HACKING document [3].

Thanks again, and please feel free to reach out with any questions.


[1] http://www.canonical.com/contributors
[2] https://launchpad.net/~contributor-agreement-canonical/+members
[3] http://cloudinit.readthedocs.io/en/latest/topics/hacking.html

review: Needs Information
Revision history for this message
Ryan Harper (raharper) wrote :

Hi Stanislav,

I've marked this branch Work in Progress. Once you've signed the CLA, please
move this branch state back to "Needs Review" and we'll pick things up from there.

Revision history for this message
Stanislav Makar (smakar) wrote :

Hi,
Done, branch is in "Needs Review" state.
Thanks

пн, 8 квіт. 2019 о 21:30 Ryan Harper <email address hidden> пише:

> Hi Stanislav,
>
> I've marked this branch Work in Progress. Once you've signed the CLA,
> please
> move this branch state back to "Needs Review" and we'll pick things up
> from there.
> --
> https://code.launchpad.net/~smakar/cloud-init/+git/cloud-init/+merge/362105
> You are the owner of ~smakar/cloud-init:bond0_issue.
>

--
Всього найкращого,
*Стас Макар*

Revision history for this message
Ryan Harper (raharper) wrote :

Thanks! I've pointed CI at this branch.

Revision history for this message
Server Team CI bot (server-team-bot) wrote :

PASSED: Continuous integration, rev:1084a51a4e62e0434f44753e5269963957fa7fa8
https://jenkins.ubuntu.com/server/job/cloud-init-ci/690/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/690/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ryan Harper (raharper) wrote :

Thanks

review: Approve
Revision history for this message
Ryan Harper (raharper) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/cloudinit/net/__init__.py b/cloudinit/net/__init__.py
2index 3642fb1..e758006 100644
3--- a/cloudinit/net/__init__.py
4+++ b/cloudinit/net/__init__.py
5@@ -622,6 +622,8 @@ def get_interfaces():
6 continue
7 if is_vlan(name):
8 continue
9+ if is_bond(name):
10+ continue
11 mac = get_interface_mac(name)
12 # some devices may not have a mac (tun0)
13 if not mac:

Subscribers

People subscribed via source and target branches