diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-10-01 14:59:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-10-01 14:59:04 +0000 |
| commit | 2ceb9a61111e48f3ccee68732291e40897634968 (patch) | |
| tree | f1c3dc48e224d3d98d495f1b08207d87f3be69ac /network/config/bond-with-vlans/controller.yaml | |
| parent | 917c03864a8a99a75fdc5ebbe7a5785ddc7ce981 (diff) | |
| parent | 8f02b02278f46366956e694e20050b585a55d226 (diff) | |
Merge "Add DnsServers param to network config templates"
Diffstat (limited to 'network/config/bond-with-vlans/controller.yaml')
| -rw-r--r-- | network/config/bond-with-vlans/controller.yaml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/network/config/bond-with-vlans/controller.yaml b/network/config/bond-with-vlans/controller.yaml index cd1961ad..4290be20 100644 --- a/network/config/bond-with-vlans/controller.yaml +++ b/network/config/bond-with-vlans/controller.yaml @@ -63,6 +63,10 @@ parameters: default: '24' description: The subnet CIDR 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 @@ -93,6 +97,7 @@ resources: - type: ovs_bridge name: {get_input: bridge_name} + dns_servers: {get_param: DnsServers} members: - type: ovs_bond |