From 8f02b02278f46366956e694e20050b585a55d226 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Wed, 23 Sep 2015 16:29:00 -0400 Subject: 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 --- network/config/bond-with-vlans/ceph-storage.yaml | 5 +++++ network/config/bond-with-vlans/cinder-storage.yaml | 5 +++++ network/config/bond-with-vlans/compute.yaml | 5 +++++ network/config/bond-with-vlans/controller.yaml | 5 +++++ network/config/bond-with-vlans/swift-storage.yaml | 5 +++++ network/config/single-nic-vlans/ceph-storage.yaml | 5 +++++ network/config/single-nic-vlans/cinder-storage.yaml | 5 +++++ network/config/single-nic-vlans/compute.yaml | 5 +++++ network/config/single-nic-vlans/controller.yaml | 5 +++++ network/config/single-nic-vlans/swift-storage.yaml | 5 +++++ 10 files changed, 50 insertions(+) (limited to 'network/config') diff --git a/network/config/bond-with-vlans/ceph-storage.yaml b/network/config/bond-with-vlans/ceph-storage.yaml index cffc06f4..620d1f7a 100644 --- a/network/config/bond-with-vlans/ceph-storage.yaml +++ b/network/config/bond-with-vlans/ceph-storage.yaml @@ -49,6 +49,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 @@ -65,6 +69,7 @@ resources: type: interface name: nic1 use_dhcp: false + dns_servers: {get_param: DnsServers} addresses: - ip_netmask: diff --git a/network/config/bond-with-vlans/cinder-storage.yaml b/network/config/bond-with-vlans/cinder-storage.yaml index 894d5982..f4c6de8f 100644 --- a/network/config/bond-with-vlans/cinder-storage.yaml +++ b/network/config/bond-with-vlans/cinder-storage.yaml @@ -53,6 +53,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 @@ -69,6 +73,7 @@ resources: type: interface name: nic1 use_dhcp: false + dns_servers: {get_param: DnsServers} addresses: - ip_netmask: diff --git a/network/config/bond-with-vlans/compute.yaml b/network/config/bond-with-vlans/compute.yaml index 7c79cd1a..8cb3705b 100644 --- a/network/config/bond-with-vlans/compute.yaml +++ b/network/config/bond-with-vlans/compute.yaml @@ -53,6 +53,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 @@ -69,6 +73,7 @@ resources: type: interface name: nic1 use_dhcp: false + dns_servers: {get_param: DnsServers} addresses: - ip_netmask: 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 diff --git a/network/config/bond-with-vlans/swift-storage.yaml b/network/config/bond-with-vlans/swift-storage.yaml index f182baef..f6b2a699 100644 --- a/network/config/bond-with-vlans/swift-storage.yaml +++ b/network/config/bond-with-vlans/swift-storage.yaml @@ -53,6 +53,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 @@ -69,6 +73,7 @@ resources: type: interface name: nic1 use_dhcp: false + dns_servers: {get_param: DnsServers} addresses: - ip_netmask: 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: -- cgit 1.2.3-korg