summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--network/config/bond-with-vlans/ceph-storage.yaml10
-rw-r--r--network/config/bond-with-vlans/cinder-storage.yaml10
-rw-r--r--network/config/bond-with-vlans/compute.yaml10
-rw-r--r--network/config/bond-with-vlans/controller.yaml12
-rw-r--r--network/config/bond-with-vlans/swift-storage.yaml10
5 files changed, 1 insertions, 51 deletions
diff --git a/network/config/bond-with-vlans/ceph-storage.yaml b/network/config/bond-with-vlans/ceph-storage.yaml
index ed9fff7a..cd70cbef 100644
--- a/network/config/bond-with-vlans/ceph-storage.yaml
+++ b/network/config/bond-with-vlans/ceph-storage.yaml
@@ -50,16 +50,6 @@ resources:
network_config:
-
type: ovs_bridge
- name: br-storage
- use_dhcp: true
- members:
- -
- type: interface
- name: nic1
- # force the MAC address of the bridge to this interface
- primary: true
- -
- type: ovs_bridge
name: br-bond
members:
-
diff --git a/network/config/bond-with-vlans/cinder-storage.yaml b/network/config/bond-with-vlans/cinder-storage.yaml
index 95733fca..866112cb 100644
--- a/network/config/bond-with-vlans/cinder-storage.yaml
+++ b/network/config/bond-with-vlans/cinder-storage.yaml
@@ -53,16 +53,6 @@ resources:
network_config:
-
type: ovs_bridge
- name: br-storage
- use_dhcp: true
- members:
- -
- type: interface
- name: nic1
- # force the MAC address of the bridge to this interface
- primary: true
- -
- type: ovs_bridge
name: br-bond
members:
-
diff --git a/network/config/bond-with-vlans/compute.yaml b/network/config/bond-with-vlans/compute.yaml
index 709b3b5b..5105ee14 100644
--- a/network/config/bond-with-vlans/compute.yaml
+++ b/network/config/bond-with-vlans/compute.yaml
@@ -53,16 +53,6 @@ resources:
network_config:
-
type: ovs_bridge
- name: {get_input: bridge_name}
- use_dhcp: true
- members:
- -
- type: interface
- name: nic1
- # force the MAC address of the bridge to this interface
- primary: true
- -
- type: ovs_bridge
name: br-bond
members:
-
diff --git a/network/config/bond-with-vlans/controller.yaml b/network/config/bond-with-vlans/controller.yaml
index 16a0dec2..2498376d 100644
--- a/network/config/bond-with-vlans/controller.yaml
+++ b/network/config/bond-with-vlans/controller.yaml
@@ -61,21 +61,11 @@ resources:
network_config:
-
type: ovs_bridge
- name: {get_input: bridge_name}
- use_dhcp: true
- members:
- -
- type: interface
- name: nic1
- # force the MAC address of the bridge to this interface
- primary: true
- -
- type: ovs_bridge
name: br-bond
members:
-
type: ovs_bond
- name: bond1
+ name: {get_input: bridge_name}
ovs_options: {get_param: BondInterfaceOvsOptions}
members:
-
diff --git a/network/config/bond-with-vlans/swift-storage.yaml b/network/config/bond-with-vlans/swift-storage.yaml
index 6549ce7a..f31ed0e7 100644
--- a/network/config/bond-with-vlans/swift-storage.yaml
+++ b/network/config/bond-with-vlans/swift-storage.yaml
@@ -53,16 +53,6 @@ resources:
network_config:
-
type: ovs_bridge
- name: br-storage
- use_dhcp: true
- members:
- -
- type: interface
- name: nic1
- # force the MAC address of the bridge to this interface
- primary: true
- -
- type: ovs_bridge
name: br-bond
members:
-