From 3b5e8789871e1722f8a5122236893730cf3d1751 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Thu, 21 Aug 2014 13:25:38 -0400 Subject: 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. --- etc/os-net-config/samples/bridge_vlan.json | 16 ++++++++++------ etc/os-net-config/samples/bridge_vlan.yaml | 13 ++++++++----- 2 files changed, 18 insertions(+), 11 deletions(-) (limited to 'etc/os-net-config') 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 -- cgit 1.2.3-korg