openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Cleanup some inline comments in network/config"

Browse Source
This commit is contained in:
Jenkins 2016-11-27 19:31:39 +00:00 committed by Gerrit Code Review
commit 597de6ec40
10 changed files with 0 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net-config-bond.yaml
View File

@ -56,14 +56,6 @@ resources:
type: ovs_bridge
name: {get_input: bridge_name}
use_dhcp: true
# Can't do this yet: https://bugs.launchpad.net/heat/+bug/1344284
#ovs_extra:
# - list_join:
# - ' '
# - - br-set-external-id
# - {get_input: bridge_name}
# - bridge-id
# - {get_input: bridge_name}
members:
-
type: ovs_bond
@ -71,7 +63,6 @@ resources:
use_dhcp: true
ovs_options: {get_param: BondInterfaceOvsOptions}
members:
# os-net-config translates nic1 => em1 (for example)
-
type: interface
name: nic1

8
net-config-bridge.yaml
View File

@ -45,14 +45,6 @@ resources:
type: ovs_bridge
name: {get_input: bridge_name}
use_dhcp: true
# Can't do this yet: https://bugs.launchpad.net/heat/+bug/1344284
#ovs_extra:
# - list_join:
# - ' '
# - - br-set-external-id
# - {get_input: bridge_name}
# - bridge-id
# - {get_input: bridge_name}
members:
-
type: interface

9
net-config-static-bridge-with-external-dhcp.yaml
View File

@ -68,15 +68,6 @@ resources:
primary: true
-
type: interface
# would like to do the following, but can't b/c of:
# https://bugs.launchpad.net/heat/+bug/1344284
# name:
# list_join:
# - '/'
# - - {get_input: bridge_name}
# - ':0'
# So, just hardcode to br-ex:0 for now, br-ex is hardcoded in
# controller.yaml anyway.
name: br-ex:0
addresses:
-

2
network/config/bond-with-vlans/controller-v6.yaml
View File

@ -115,7 +115,6 @@ resources:
-
ip_netmask: 169.254.169.254/32
next_hop: {get_param: EC2MetadataIp}
# IPv4 Default Route
-
default: true
next_hop: {get_param: ControlPlaneDefaultRoute}
@ -144,7 +143,6 @@ resources:
-
ip_netmask: {get_param: ExternalIpSubnet}
routes:
# IPv6 Default Route
-
default: true
next_hop: {get_param: ExternalInterfaceDefaultRoute}

2
network/config/multiple-nics/compute.yaml
View File

@ -122,7 +122,6 @@ resources:
-
ip_netmask: {get_param: InternalApiIpSubnet}
-
# Create a bridge which can also be used for VLAN-mode bridge mapping
type: ovs_bridge
name: br-tenant
use_dhcp: false
@ -134,7 +133,6 @@ resources:
type: interface
name: nic5
use_dhcp: false
# force the MAC address of the bridge to this interface
primary: true
# Uncomment when including environments/network-management.yaml
# If setting default route on the Management interface, comment

4
network/config/multiple-nics/controller-v6.yaml
View File

@ -132,7 +132,6 @@ resources:
-
ip_netmask: {get_param: InternalApiIpSubnet}
-
# Create a bridge which can also be used for VLAN-mode bridge mapping
type: ovs_bridge
name: br-tenant
use_dhcp: false
@ -144,7 +143,6 @@ resources:
type: interface
name: nic5
use_dhcp: false
# force the MAC address of the bridge to this interface
primary: true
-
type: ovs_bridge
@ -155,7 +153,6 @@ resources:
-
ip_netmask: {get_param: ExternalIpSubnet}
routes:
# IPv6 Default Route
-
default: true
next_hop: {get_param: ExternalInterfaceDefaultRoute}
@ -163,7 +160,6 @@ resources:
-
type: interface
name: nic6
# force the MAC address of the bridge to this interface
primary: true
# Uncomment when including environments/network-management.yaml
# If setting default route on the Management interface, comment

3
network/config/multiple-nics/controller.yaml
View File

@ -126,7 +126,6 @@ resources:
-
ip_netmask: {get_param: InternalApiIpSubnet}
-
# Create a bridge which can also be used for VLAN-mode bridge mapping
type: ovs_bridge
name: br-tenant
use_dhcp: false
@ -138,7 +137,6 @@ resources:
type: interface
name: nic5
use_dhcp: false
# force the MAC address of the bridge to this interface
primary: true
-
type: ovs_bridge
@ -156,7 +154,6 @@ resources:
-
type: interface
name: nic6
# force the MAC address of the bridge to this interface
primary: true
# Uncomment when including environments/network-management.yaml
# If setting default route on the Management interface, comment

3
network/config/single-nic-linux-bridge-vlans/controller-v6.yaml
View File

@ -106,7 +106,6 @@ resources:
-
ip_netmask: 169.254.169.254/32
next_hop: {get_param: EC2MetadataIp}
# IPv4 Default Route
-
default: true
next_hop: {get_param: ControlPlaneDefaultRoute}
@ -114,7 +113,6 @@ resources:
-
type: interface
name: {get_input: interface_name}
# force the MAC address of the bridge to this interface
primary: true
-
type: vlan
@ -124,7 +122,6 @@ resources:
-
ip_netmask: {get_param: ExternalIpSubnet}
routes:
# IPv6 Default Route
-
default: true
next_hop: {get_param: ExternalInterfaceDefaultRoute}

3
network/config/single-nic-linux-bridge-vlans/controller.yaml
View File

@ -104,7 +104,6 @@ resources:
-
ip_netmask: 169.254.169.254/32
next_hop: {get_param: EC2MetadataIp}
# IPv4 Default Route
-
default: true
next_hop: {get_param: ControlPlaneDefaultRoute}
@ -112,7 +111,6 @@ resources:
-
type: interface
name: {get_input: interface_name}
# force the MAC address of the bridge to this interface
primary: true
-
type: vlan
@ -122,7 +120,6 @@ resources:
-
ip_netmask: {get_param: ExternalIpSubnet}
routes:
# IPv6 Default Route
-
default: true
next_hop: {get_param: ExternalInterfaceDefaultRoute}

3
network/config/single-nic-vlans/controller-v6.yaml
View File

@ -106,7 +106,6 @@ resources:
-
ip_netmask: 169.254.169.254/32
next_hop: {get_param: EC2MetadataIp}
# IPv4 Default Route
-
default: true
next_hop: {get_param: ControlPlaneDefaultRoute}
@ -114,7 +113,6 @@ resources:
-
type: interface
name: nic1
# force the MAC address of the bridge to this interface
primary: true
-
type: vlan
@ -123,7 +121,6 @@ resources:
-
ip_netmask: {get_param: ExternalIpSubnet}
routes:
# IPv6 Default Route
-
default: true
next_hop: {get_param: ExternalInterfaceDefaultRoute}