Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Parameterize the heat-docker-agents image"
[apex-tripleo-heat-templates.git]
/
network
/
config
/
bond-with-vlans
/
controller.yaml
diff --git
a/network/config/bond-with-vlans/controller.yaml
b/network/config/bond-with-vlans/controller.yaml
index
eb4399e
..
d3627ea
100644
(file)
--- a/
network/config/bond-with-vlans/controller.yaml
+++ b/
network/config/bond-with-vlans/controller.yaml
@@
-29,6
+29,10
@@
parameters:
default: ''
description: IP address/subnet on the tenant network
type: string
default: ''
description: IP address/subnet on the tenant network
type: string
+ ManagementIpSubnet: # Only populated when including environments/network-management.yaml
+ default: ''
+ description: IP address/subnet on the management network
+ type: string
BondInterfaceOvsOptions:
default: 'bond_mode=active-backup'
description: The ovs_options string for the bond interface. Set things like
BondInterfaceOvsOptions:
default: 'bond_mode=active-backup'
description: The ovs_options string for the bond interface. Set things like
@@
-54,6
+58,10
@@
parameters:
default: 50
description: Vlan ID for the tenant network traffic.
type: number
default: 50
description: Vlan ID for the tenant network traffic.
type: number
+ ManagementNetworkVlanID:
+ default: 60
+ description: Vlan ID for the management network traffic.
+ type: number
ExternalInterfaceDefaultRoute:
default: '10.0.0.1'
description: default route for the external network
ExternalInterfaceDefaultRoute:
default: '10.0.0.1'
description: default route for the external network
@@
-119,7
+127,7
@@
resources:
ip_netmask: {get_param: ExternalIpSubnet}
routes:
-
ip_netmask: {get_param: ExternalIpSubnet}
routes:
-
- ip_netmask: 0.0.0.0/0
+ default: true
next_hop: {get_param: ExternalInterfaceDefaultRoute}
-
type: vlan
next_hop: {get_param: ExternalInterfaceDefaultRoute}
-
type: vlan
@@
-149,6
+157,14
@@
resources:
addresses:
-
ip_netmask: {get_param: TenantIpSubnet}
addresses:
-
ip_netmask: {get_param: TenantIpSubnet}
+ # Uncomment when including environments/network-management.yaml
+ #-
+ # type: vlan
+ # device: bond1
+ # vlan_id: {get_param: ManagementNetworkVlanID}
+ # addresses:
+ # -
+ # ip_netmask: {get_param: ManagementIpSubnet}
outputs:
OS::stack_id:
outputs:
OS::stack_id: