openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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
This commit is contained in:
Dan Prince 2015-06-03 22:08:50 -04:00
parent 5033fd0689
commit ca36b5d9e1
6 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
network/config/bond-with-vlans/ceph-storage.yaml
View File

@ -36,7 +36,7 @@ resources:
network_config:
-
type: ovs_bridge
name: {get_input: bridge_name}
name: br-storage
use_dhcp: true
members:
-

2
network/config/bond-with-vlans/cinder-storage.yaml
View File

@ -36,7 +36,7 @@ resources:
network_config:
-
type: ovs_bridge
name: {get_input: bridge_name}
name: br-storage
use_dhcp: true
members:
-

2
network/config/bond-with-vlans/swift-storage.yaml
View File

@ -36,7 +36,7 @@ resources:
network_config:
-
type: ovs_bridge
name: {get_input: bridge_name}
name: br-storage
use_dhcp: true
members:
-

4
network/config/single-nic-vlans/ceph-storage.yaml
View File

@ -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:
-

5
network/config/single-nic-vlans/cinder-storage.yaml
View File

@ -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:
-

5
network/config/single-nic-vlans/swift-storage.yaml
View File

@ -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:
-