diff options
| author |   Dan Prince <dprince@redhat.com> | 2014-08-21 13:25:38 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2014-08-21 13:25:38 -0400 |
| commit | 3b5e8789871e1722f8a5122236893730cf3d1751 (patch) | |
| tree | 3a737d9cc6be623264643d39f7540257c8508838 /etc | |
| parent | db8deb0a062178ebb99f1a010eb5af79cee2390e (diff) | |
A vlan on an OVS bridge doesn't require a device
Updates the object model so that a VLAN on top of a bridge
(an OVS int port) doesn't require a physical device to
be set in the object model.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/os-net-config/samples/bridge_vlan.json | 16 | ||||
| -rw-r--r-- | etc/os-net-config/samples/bridge_vlan.yaml | 13 |
2 files changed, 18 insertions, 11 deletions
diff --git a/etc/os-net-config/samples/bridge_vlan.json b/etc/os-net-config/samples/bridge_vlan.json index 1e351e0..244c89a 100644 --- a/etc/os-net-config/samples/bridge_vlan.json +++ b/etc/os-net-config/samples/bridge_vlan.json @@ -2,20 +2,24 @@ { "type": "ovs_bridge", "name": "br-ctlplane", + "use_dhcp": "true", "members": [ { + "type": "interface", + "name": "em1" + }, + { "type": "vlan", - "device": "em1", "vlan_id": 16, "addresses": [{ "ip_netmask": "192.0.2.1/24" - }], - "routes": [{ - "next_hop": "192.0.2.1", - "ip_netmask": "192.0.2.1/24" }] } - ] + ], + "routes": [{ + "next_hop": "192.0.2.1", + "ip_netmask": "192.0.2.1/24" + }] } ] } diff --git a/etc/os-net-config/samples/bridge_vlan.yaml b/etc/os-net-config/samples/bridge_vlan.yaml index 9f25e09..a17d61e 100644 --- a/etc/os-net-config/samples/bridge_vlan.yaml +++ b/etc/os-net-config/samples/bridge_vlan.yaml @@ -2,15 +2,18 @@ network_config: - type: ovs_bridge name: br-ctlplane + use_dhcp: true members: - + type: interface + name: em1 + - type: vlan - device: em1 vlan_id: 16 addresses: - ip_netmask: 192.0.2.1/24 - routes: - - - next_hop: 192.0.2.1 - ip_netmask: 192.0.2.1/24 + routes: + - + next_hop: 192.0.2.1 + ip_netmask: 192.0.2.1/24 |