aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--network/config/bond-with-vlans/ceph-storage.yaml2
-rw-r--r--network/config/bond-with-vlans/cinder-storage.yaml2
-rw-r--r--network/config/bond-with-vlans/swift-storage.yaml2
-rw-r--r--network/config/single-nic-vlans/ceph-storage.yaml4
-rw-r--r--network/config/single-nic-vlans/cinder-storage.yaml5
-rw-r--r--network/config/single-nic-vlans/swift-storage.yaml5
6 files changed, 6 insertions, 14 deletions
diff --git a/network/config/bond-with-vlans/ceph-storage.yaml b/network/config/bond-with-vlans/ceph-storage.yaml
index 90617b30..39beee5a 100644
--- a/network/config/bond-with-vlans/ceph-storage.yaml
+++ b/network/config/bond-with-vlans/ceph-storage.yaml
@@ -36,7 +36,7 @@ resources:
network_config:
-
type: ovs_bridge
- name: {get_input: bridge_name}
+ name: br-storage
use_dhcp: true
members:
-
diff --git a/network/config/bond-with-vlans/cinder-storage.yaml b/network/config/bond-with-vlans/cinder-storage.yaml
index 95204d35..6a244c5a 100644
--- a/network/config/bond-with-vlans/cinder-storage.yaml
+++ b/network/config/bond-with-vlans/cinder-storage.yaml
@@ -36,7 +36,7 @@ resources:
network_config:
-
type: ovs_bridge
- name: {get_input: bridge_name}
+ name: br-storage
use_dhcp: true
members:
-
diff --git a/network/config/bond-with-vlans/swift-storage.yaml b/network/config/bond-with-vlans/swift-storage.yaml
index 337fef5b..1abb9f65 100644
--- a/network/config/bond-with-vlans/swift-storage.yaml
+++ b/network/config/bond-with-vlans/swift-storage.yaml
@@ -36,7 +36,7 @@ resources:
network_config:
-
type: ovs_bridge
- name: {get_input: bridge_name}
+ name: br-storage
use_dhcp: true
members:
-
diff --git a/network/config/single-nic-vlans/ceph-storage.yaml b/network/config/single-nic-vlans/ceph-storage.yaml
index 0bc6253c..9ab1734d 100644
--- a/network/config/single-nic-vlans/ceph-storage.yaml
+++ b/network/config/single-nic-vlans/ceph-storage.yaml
@@ -36,7 +36,7 @@ resources:
network_config:
-
type: ovs_bridge
- name: {get_input: bridge_name}
+ name: br-storage
use_dhcp: true
members:
-
@@ -47,14 +47,12 @@ resources:
primary: true
-
type: vlan
- device: bond1
vlan_id: 30
addresses:
-
ip_netmask: {get_param: StorageIpSubnet}
-
type: vlan
- device: bond1
vlan_id: 40
addresses:
-
diff --git a/network/config/single-nic-vlans/cinder-storage.yaml b/network/config/single-nic-vlans/cinder-storage.yaml
index 1ca239c1..72f6126c 100644
--- a/network/config/single-nic-vlans/cinder-storage.yaml
+++ b/network/config/single-nic-vlans/cinder-storage.yaml
@@ -36,7 +36,7 @@ resources:
network_config:
-
type: ovs_bridge
- name: {get_input: bridge_name}
+ name: br-storage
use_dhcp: true
members:
-
@@ -47,21 +47,18 @@ resources:
primary: true
-
type: vlan
- device: bond1
vlan_id: 20
addresses:
-
ip_netmask: {get_param: InternalApiIpSubnet}
-
type: vlan
- device: bond1
vlan_id: 30
addresses:
-
ip_netmask: {get_param: StorageIpSubnet}
-
type: vlan
- device: bond1
vlan_id: 40
addresses:
-
diff --git a/network/config/single-nic-vlans/swift-storage.yaml b/network/config/single-nic-vlans/swift-storage.yaml
index b2477175..5733b316 100644
--- a/network/config/single-nic-vlans/swift-storage.yaml
+++ b/network/config/single-nic-vlans/swift-storage.yaml
@@ -36,7 +36,7 @@ resources:
network_config:
-
type: ovs_bridge
- name: {get_input: bridge_name}
+ name: br-storage
use_dhcp: true
members:
-
@@ -47,21 +47,18 @@ resources:
primary: true
-
type: vlan
- device: bond1
vlan_id: 20
addresses:
-
ip_netmask: {get_param: InternalApiIpSubnet}
-
type: vlan
- device: bond1
vlan_id: 30
addresses:
-
ip_netmask: {get_param: StorageIpSubnet}
-
type: vlan
- device: bond1
vlan_id: 40
addresses:
-