diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-06-16 07:50:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-06-16 07:50:19 +0000 |
| commit | 1a3049c32e78c40e3ba9b275b9c278e65aa397e1 (patch) | |
| tree | 7cee02437fa3e12a5915dbd6cd56632994b74820 /network | |
| parent | f20e64479a8760b3794f58a7241e14f279772aeb (diff) | |
| parent | ca36b5d9e19e7eb5e1e4de0d6bae4e1d364f30fb (diff) | |
Merge "network/config storage role fixes"
Diffstat (limited to 'network')
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: - |