diff options
| author |   Dan Prince <dprince@redhat.com> | 2015-09-23 16:29:00 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2015-09-30 17:05:37 -0400 |
| commit | 8f02b02278f46366956e694e20050b585a55d226 (patch) | |
| tree | d4bd93f3440f394671a749eb0a1ca3b85e968119 /network/config/single-nic-vlans | |
| parent | 9e918a4a517f62d4417909311041e3e54a726462 (diff) | |
Add DnsServers param to network config templates
This patch adds a new optional DnsServers parameter
which can be used to provide a custom list of DNS
resolvers which will be configured in resolv.conf.
Change-Id: I2bb7259ebc09d786dc56da18694c862f802091b1
Depends-On: I9edecfdd4e1d0f39883b72be554cd92c5685881d
Diffstat (limited to 'network/config/single-nic-vlans')
5 files changed, 25 insertions, 0 deletions
diff --git a/network/config/single-nic-vlans/ceph-storage.yaml b/network/config/single-nic-vlans/ceph-storage.yaml index ddb41633..5148c520 100644 --- a/network/config/single-nic-vlans/ceph-storage.yaml +++ b/network/config/single-nic-vlans/ceph-storage.yaml @@ -44,6 +44,10 @@ parameters: 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 @@ -60,6 +64,7 @@ resources: type: ovs_bridge name: br-storage use_dhcp: false + dns_servers: {get_param: DnsServers} addresses: - ip_netmask: diff --git a/network/config/single-nic-vlans/cinder-storage.yaml b/network/config/single-nic-vlans/cinder-storage.yaml index 4b2a5753..e79a9f4b 100644 --- a/network/config/single-nic-vlans/cinder-storage.yaml +++ b/network/config/single-nic-vlans/cinder-storage.yaml @@ -48,6 +48,10 @@ parameters: 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 @@ -64,6 +68,7 @@ resources: type: ovs_bridge name: br-storage use_dhcp: false + dns_servers: {get_param: DnsServers} addresses: - ip_netmask: diff --git a/network/config/single-nic-vlans/compute.yaml b/network/config/single-nic-vlans/compute.yaml index dc8d6851..4e93b31c 100644 --- a/network/config/single-nic-vlans/compute.yaml +++ b/network/config/single-nic-vlans/compute.yaml @@ -48,6 +48,10 @@ parameters: 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 @@ -64,6 +68,7 @@ resources: type: ovs_bridge name: {get_input: bridge_name} use_dhcp: false + dns_servers: {get_param: DnsServers} addresses: - ip_netmask: diff --git a/network/config/single-nic-vlans/controller.yaml b/network/config/single-nic-vlans/controller.yaml index c0f4132b..3c536d67 100644 --- a/network/config/single-nic-vlans/controller.yaml +++ b/network/config/single-nic-vlans/controller.yaml @@ -57,6 +57,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 @@ -73,6 +77,7 @@ resources: type: ovs_bridge name: {get_input: bridge_name} use_dhcp: false + dns_servers: {get_param: DnsServers} addresses: - ip_netmask: diff --git a/network/config/single-nic-vlans/swift-storage.yaml b/network/config/single-nic-vlans/swift-storage.yaml index 5a308df0..83b3304f 100644 --- a/network/config/single-nic-vlans/swift-storage.yaml +++ b/network/config/single-nic-vlans/swift-storage.yaml @@ -48,6 +48,10 @@ parameters: 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 @@ -64,6 +68,7 @@ resources: type: ovs_bridge name: br-storage use_dhcp: false + dns_servers: {get_param: DnsServers} addresses: - ip_netmask: |