aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-25 06:14:32 +0000
committerGerrit Code Review <review@openstack.org>2017-04-25 06:14:32 +0000
commit9d27aece869e7ded40b7719cae6e03c3c4c48ae9 (patch)
tree8ef421147f8c6987de60ecec7c140f9be58317a0
parent52c59fbb55cba7d9c4b66d2260d27e6c8fa83e9d (diff)
parented0f6e61d2e83d0b4b690797d5bf61e590c23e92 (diff)
Merge "Removed vlan port on ovs_user_bridge in dpdk bond samples"
-rw-r--r--etc/os-net-config/samples/ovs_dpdk_bond.json9
-rw-r--r--etc/os-net-config/samples/ovs_dpdk_bond.yaml6
2 files changed, 0 insertions, 15 deletions
diff --git a/etc/os-net-config/samples/ovs_dpdk_bond.json b/etc/os-net-config/samples/ovs_dpdk_bond.json
index 176c917..7964e69 100644
--- a/etc/os-net-config/samples/ovs_dpdk_bond.json
+++ b/etc/os-net-config/samples/ovs_dpdk_bond.json
@@ -28,15 +28,6 @@
]
},
]
- },
- {
- "type" : "vlan",
- "vlan_id" : 16,
- "addresses" : [
- {
- "ip_netmask" : "192.0.2.1/24"
- }
- ]
}
]
}
diff --git a/etc/os-net-config/samples/ovs_dpdk_bond.yaml b/etc/os-net-config/samples/ovs_dpdk_bond.yaml
index cc3dfe5..2fcd4f3 100644
--- a/etc/os-net-config/samples/ovs_dpdk_bond.yaml
+++ b/etc/os-net-config/samples/ovs_dpdk_bond.yaml
@@ -28,9 +28,3 @@ network_config:
-
type: interface
name: nic3
- -
- type: vlan
- vlan_id: 16
- addresses:
- -
- ip_netmask: 192.0.2.1/24 \ No newline at end of file