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 "Stop using puppet to configure VIPs in /etc/hosts"
[apex-tripleo-heat-templates.git]
/
net-config-bridge.yaml
diff --git
a/net-config-bridge.yaml
b/net-config-bridge.yaml
index
ad16ef0
..
318eca8
100644
(file)
--- a/
net-config-bridge.yaml
+++ b/
net-config-bridge.yaml
@@
-28,6
+28,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:
+ default: ''
+ description: IP address/subnet on the management network
+ type: string
resources:
OsNetConfigImpl:
resources:
OsNetConfigImpl:
@@
-41,14
+45,6
@@
resources:
type: ovs_bridge
name: {get_input: bridge_name}
use_dhcp: true
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
members:
-
type: interface