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 "Update .sh references from openstack-keystone to openstack-core"
[apex-tripleo-heat-templates.git]
/
net-config-static-bridge.yaml
diff --git
a/net-config-static-bridge.yaml
b/net-config-static-bridge.yaml
index
38b483b
..
52c8f89
100644
(file)
--- a/
net-config-static-bridge.yaml
+++ b/
net-config-static-bridge.yaml
@@
-36,6
+36,10
@@
parameters:
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
type: string
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
type: string
+ DnsServers: # Override this via parameter_defaults
+ default: []
+ description: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf.
+ type: comma_delimited_list
EC2MetadataIp: # Override this via parameter_defaults
description: The IP address of the EC2 metadata server.
type: string
EC2MetadataIp: # Override this via parameter_defaults
description: The IP address of the EC2 metadata server.
type: string
@@
-52,6
+56,7
@@
resources:
type: ovs_bridge
name: {get_input: bridge_name}
use_dhcp: false
type: ovs_bridge
name: {get_input: bridge_name}
use_dhcp: false
+ dns_servers: {get_param: DnsServers}
addresses:
-
ip_netmask:
addresses:
-
ip_netmask: