summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2015-06-03 22:08:50 -0400
committerDan Prince <dprince@redhat.com>2015-06-09 13:32:31 -0400
commitca36b5d9e19e7eb5e1e4de0d6bae4e1d364f30fb (patch)
tree57335a53a4cd53f5f258b1c92ebb0e62a466cdcc
parent5033fd06894c3ac9ff99a82cb74020868da42306 (diff)
network/config storage role fixes
None of the storage roles have Heat parameters for the bridge name. Instead of wiring in Heat parameters for bridge name this patch hard codes the bridge name for the storage roles to 'br-storage'. This functionally fixes the network config scripts for each of the storage roles. For the single-nic-vlans storage roles we also remove the 'bond1' reference which was also incorrectly specified. Change-Id: I460d1a17e44ee49e960117ec85edd3ae25894333
-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:
-