Merge lp:~raharper/cloud-init/trunk.network-data-bridge into lp:~cloud-init-dev/cloud-init/trunk

[Ryan Harper]

ConfigDrive: Add support for "bridge" link types

Openstack Mikata LinuxBridge mode emits links with type: bridge
which need conversion into network config bridge. This patch
creates the require keys and copies in any keys from network_data.json
that start with 'bridge'. It's unclear whether the OpenStack
LinuxBridge mode provides the ability to attach interfaces to the
bridge so we do not attempt to populate the key 'bridge_interfaces' with
a specific value at this time.

[Ryan Harper (raharper)]

Use the network_data.json from here:

https://gist.github.com/dmsimard/d6eaa8b61f3c601d833b29ef430637da

This fails since the network_data -> network_config converter did not
handle link type bridge. I've not been able to find out if LinuxBridge
in OpenStack would ever include metadata that indicated if the bridge
would use additional links as ports on the bridge, so for now we don't
populate the `bridge_interfaces` list.

The above gist renders into the following eni:

auto lo
iface lo inet loopback
    dns-nameservers 172.19.0.12

auto tap1a81968a-79
iface tap1a81968a-79 inet static
    address 172.19.1.34
    netmask 255.255.252.0
    post-up route add default gw 172.19.3.254 || true
    pre-down route del default gw 172.19.3.254 || true

[Joshua Harlow (harlowja)]

Seems good to me.

[Scott Moser (smoser)]

go ahead

review: Approve

[Ryan Harper (raharper)]

On hold, we're working out what to expect when we get type: bridge.

It appears that the network_metadata is exposing the compute node network
configuration (for example, type ovs, type: bridge)
These are how the computenode has configured networking for the guest.
 however, it's not exposing what it expects to do in the
guest.

For ovs, we translated that to a single ethernet device per entry; I think
we want to do the same for bridge.

The rackspace case with bonds, vlans and type: ethernet I think is
something that ironic might be doing here?

On Tue, May 24, 2016 at 3:00 PM, Scott Moser <email address hidden> wrote:

> Review: Approve
>
> go ahead
> --
>
> https://code.launchpad.net/~raharper/cloud-init/trunk.network-data-bridge/+merge/295591
> You are the owner of lp:~raharper/cloud-init/trunk.network-data-bridge.
>

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:1219
https://server-team-jenkins.canonical.com/job/cloud-init-ci/30/
Executed test runs:
    None: https://server-team-jenkins.canonical.com/job/lp-vote-on-merge/4/console

Click here to trigger a rebuild:
https://server-team-jenkins.canonical.com/job/cloud-init-ci/30/rebuild

review: Approve (continuous-integration)

[Scott Moser (smoser)]

Hello,
Thank you for taking the time to contribute to cloud-init. Cloud-init has moved its revision control system to git. As a result, we are marking all bzr merge proposals as 'rejected'. If you would like to re-submit this proposal for review, please do so by following the current HACKING documentation at http://cloudinit.readthedocs.io/en/latest/topics/hacking.html .

Unmerged revisions

1219. By Ryan Harper on 2016-05-24

ConfigDrive: Add support for "bridge" link types

Openstack Mikata LinuxBridge mode emits links with type: bridge
which need conversion into network config bridge. This patch
creates the require keys and copies in any keys from network_data.json
that start with 'bridge'. It's unclear whether the OpenStack
LinuxBridge mode provides the ability to attach interfaces to the
bridge so we do not attempt to populate the key 'bridge_interfaces' with
a specific value at this time.

=== modified file 'cloudinit/sources/DataSourceConfigDrive.py'
--- cloudinit/sources/DataSourceConfigDrive.py	2016-04-29 13:04:36 +0000
+++ cloudinit/sources/DataSourceConfigDrive.py	2016-05-24 14:39:39 +0000
@@ -410,6 +410,15 @@
                 'vlan_id': link['vlan_id'],
                 'mac_address': link['vlan_mac_address'],
             })
+        elif link['type'] in ['bridge']:
+            params = {}
+            for k, v in link.items():
+                if k.startswith('bridge'):
+                    params.update({k: v})
+            cfg.update({
+                'params': params,
+                'bridge_interfaces': [],
+            })
         else:
             raise ValueError(
                 'Unknown network_data link type: %s' % link['type'])