Add ability to specify dns search domains
Related-Bug: #1828854
Change-Id: Ie35a159848bbe3f86127ab81a32904a5787eb6bb
Depends-On: I45231fc53c24e1aad3f4a0026696954096430586
(cherry-picked from 91c08c1e2b
)
This commit is contained in:
parent
306412539a
commit
fd92a337ba
|
@ -76,6 +76,10 @@ parameters:
|
||||||
EC2MetadataIp: # Override this via parameter_defaults
|
EC2MetadataIp: # Override this via parameter_defaults
|
||||||
description: The IP address of the EC2 metadata server.
|
description: The IP address of the EC2 metadata server.
|
||||||
type: string
|
type: string
|
||||||
|
DnsSearchDomains: # Override this via parameter_defaults
|
||||||
|
default: []
|
||||||
|
description: A list of DNS search domains to be added (in order) to resolv.conf.
|
||||||
|
type: comma_delimited_list
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
OsNetConfigImpl:
|
OsNetConfigImpl:
|
||||||
|
@ -116,6 +120,7 @@ resources:
|
||||||
- type: ovs_bridge
|
- type: ovs_bridge
|
||||||
name: br-tenant
|
name: br-tenant
|
||||||
dns_servers: {get_param: DnsServers}
|
dns_servers: {get_param: DnsServers}
|
||||||
|
domain: {get_param: DnsSearchDomains}
|
||||||
use_dhcp: false
|
use_dhcp: false
|
||||||
addresses:
|
addresses:
|
||||||
- ip_netmask: {get_param: TenantIpSubnet}
|
- ip_netmask: {get_param: TenantIpSubnet}
|
||||||
|
|
|
@ -76,6 +76,10 @@ parameters:
|
||||||
EC2MetadataIp: # Override this via parameter_defaults
|
EC2MetadataIp: # Override this via parameter_defaults
|
||||||
description: The IP address of the EC2 metadata server.
|
description: The IP address of the EC2 metadata server.
|
||||||
type: string
|
type: string
|
||||||
|
DnsSearchDomains: # Override this via parameter_defaults
|
||||||
|
default: []
|
||||||
|
description: A list of DNS search domains to be added (in order) to resolv.conf.
|
||||||
|
type: comma_delimited_list
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
OsNetConfigImpl:
|
OsNetConfigImpl:
|
||||||
|
@ -104,6 +108,7 @@ resources:
|
||||||
- type: ovs_bridge
|
- type: ovs_bridge
|
||||||
name: br-ex
|
name: br-ex
|
||||||
dns_servers: {get_param: DnsServers}
|
dns_servers: {get_param: DnsServers}
|
||||||
|
domain: {get_param: DnsSearchDomains}
|
||||||
use_dhcp: false
|
use_dhcp: false
|
||||||
addresses:
|
addresses:
|
||||||
- ip_netmask: {get_param: ExternalIpSubnet}
|
- ip_netmask: {get_param: ExternalIpSubnet}
|
||||||
|
|
|
@ -76,6 +76,10 @@ parameters:
|
||||||
EC2MetadataIp: # Override this via parameter_defaults
|
EC2MetadataIp: # Override this via parameter_defaults
|
||||||
description: The IP address of the EC2 metadata server.
|
description: The IP address of the EC2 metadata server.
|
||||||
type: string
|
type: string
|
||||||
|
DnsSearchDomains: # Override this via parameter_defaults
|
||||||
|
default: []
|
||||||
|
description: A list of DNS search domains to be added (in order) to resolv.conf.
|
||||||
|
type: comma_delimited_list
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
OsNetConfigImpl:
|
OsNetConfigImpl:
|
||||||
|
@ -119,6 +123,7 @@ resources:
|
||||||
- type: ovs_bridge
|
- type: ovs_bridge
|
||||||
name: br-tenant
|
name: br-tenant
|
||||||
dns_servers: {get_param: DnsServers}
|
dns_servers: {get_param: DnsServers}
|
||||||
|
domain: {get_param: DnsSearchDomains}
|
||||||
use_dhcp: false
|
use_dhcp: false
|
||||||
addresses:
|
addresses:
|
||||||
- ip_netmask: {get_param: TenantIpSubnet}
|
- ip_netmask: {get_param: TenantIpSubnet}
|
||||||
|
|
|
@ -76,6 +76,10 @@ parameters:
|
||||||
EC2MetadataIp: # Override this via parameter_defaults
|
EC2MetadataIp: # Override this via parameter_defaults
|
||||||
description: The IP address of the EC2 metadata server.
|
description: The IP address of the EC2 metadata server.
|
||||||
type: string
|
type: string
|
||||||
|
DnsSearchDomains: # Override this via parameter_defaults
|
||||||
|
default: []
|
||||||
|
description: A list of DNS search domains to be added (in order) to resolv.conf.
|
||||||
|
type: comma_delimited_list
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
OsNetConfigImpl:
|
OsNetConfigImpl:
|
||||||
|
@ -105,6 +109,7 @@ resources:
|
||||||
- type: ovs_bridge
|
- type: ovs_bridge
|
||||||
name: br-ex
|
name: br-ex
|
||||||
dns_servers: {get_param: DnsServers}
|
dns_servers: {get_param: DnsServers}
|
||||||
|
domain: {get_param: DnsSearchDomains}
|
||||||
use_dhcp: false
|
use_dhcp: false
|
||||||
addresses:
|
addresses:
|
||||||
- ip_netmask: {get_param: ExternalIpSubnet}
|
- ip_netmask: {get_param: ExternalIpSubnet}
|
||||||
|
|
|
@ -76,6 +76,10 @@ parameters:
|
||||||
EC2MetadataIp: # Override this via parameter_defaults
|
EC2MetadataIp: # Override this via parameter_defaults
|
||||||
description: The IP address of the EC2 metadata server.
|
description: The IP address of the EC2 metadata server.
|
||||||
type: string
|
type: string
|
||||||
|
DnsSearchDomains: # Override this via parameter_defaults
|
||||||
|
default: []
|
||||||
|
description: A list of DNS search domains to be added (in order) to resolv.conf.
|
||||||
|
type: comma_delimited_list
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
OsNetConfigImpl:
|
OsNetConfigImpl:
|
||||||
|
@ -115,6 +119,7 @@ resources:
|
||||||
- type: ovs_bridge
|
- type: ovs_bridge
|
||||||
name: br-tenant
|
name: br-tenant
|
||||||
dns_servers: {get_param: DnsServers}
|
dns_servers: {get_param: DnsServers}
|
||||||
|
domain: {get_param: DnsSearchDomains}
|
||||||
use_dhcp: false
|
use_dhcp: false
|
||||||
addresses:
|
addresses:
|
||||||
- ip_netmask: {get_param: TenantIpSubnet}
|
- ip_netmask: {get_param: TenantIpSubnet}
|
||||||
|
|
|
@ -76,6 +76,10 @@ parameters:
|
||||||
EC2MetadataIp: # Override this via parameter_defaults
|
EC2MetadataIp: # Override this via parameter_defaults
|
||||||
description: The IP address of the EC2 metadata server.
|
description: The IP address of the EC2 metadata server.
|
||||||
type: string
|
type: string
|
||||||
|
DnsSearchDomains: # Override this via parameter_defaults
|
||||||
|
default: []
|
||||||
|
description: A list of DNS search domains to be added (in order) to resolv.conf.
|
||||||
|
type: comma_delimited_list
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
OsNetConfigImpl:
|
OsNetConfigImpl:
|
||||||
|
@ -101,6 +105,7 @@ resources:
|
||||||
- type: ovs_bridge
|
- type: ovs_bridge
|
||||||
name: br-ex
|
name: br-ex
|
||||||
dns_servers: {get_param: DnsServers}
|
dns_servers: {get_param: DnsServers}
|
||||||
|
domain: {get_param: DnsSearchDomains}
|
||||||
use_dhcp: false
|
use_dhcp: false
|
||||||
addresses:
|
addresses:
|
||||||
- ip_netmask: {get_param: ExternalIpSubnet}
|
- ip_netmask: {get_param: ExternalIpSubnet}
|
||||||
|
|
|
@ -16,6 +16,10 @@ parameters:
|
||||||
default: ''
|
default: ''
|
||||||
description: IP address/subnet on the ctlplane network
|
description: IP address/subnet on the ctlplane network
|
||||||
type: string
|
type: string
|
||||||
|
DnsSearchDomains: # Override this via parameter_defaults
|
||||||
|
default: []
|
||||||
|
description: A list of DNS search domains to be added (in order) to resolv.conf.
|
||||||
|
type: comma_delimited_list
|
||||||
{%- for network in networks %}
|
{%- for network in networks %}
|
||||||
{{network.name}}IpSubnet:
|
{{network.name}}IpSubnet:
|
||||||
default: ''
|
default: ''
|
||||||
|
@ -37,6 +41,10 @@ resources:
|
||||||
- type: ovs_bridge
|
- type: ovs_bridge
|
||||||
name: bridge_name
|
name: bridge_name
|
||||||
use_dhcp: true
|
use_dhcp: true
|
||||||
|
dns_servers:
|
||||||
|
get_param: DnsServers
|
||||||
|
domain:
|
||||||
|
get_param: DnsSearchDomains
|
||||||
members:
|
members:
|
||||||
- type: ovs_bond
|
- type: ovs_bond
|
||||||
name: bond1
|
name: bond1
|
||||||
|
|
|
@ -27,6 +27,10 @@ parameters:
|
||||||
EC2MetadataIp: # Override this via parameter_defaults
|
EC2MetadataIp: # Override this via parameter_defaults
|
||||||
description: The IP address of the EC2 metadata server.
|
description: The IP address of the EC2 metadata server.
|
||||||
type: string
|
type: string
|
||||||
|
DnsSearchDomains: # Override this via parameter_defaults
|
||||||
|
default: []
|
||||||
|
description: A list of DNS search domains to be added (in order) to resolv.conf.
|
||||||
|
type: comma_delimited_list
|
||||||
resources:
|
resources:
|
||||||
OsNetConfigImpl:
|
OsNetConfigImpl:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
|
@ -44,6 +48,8 @@ resources:
|
||||||
use_dhcp: false
|
use_dhcp: false
|
||||||
dns_servers:
|
dns_servers:
|
||||||
get_param: DnsServers
|
get_param: DnsServers
|
||||||
|
domain:
|
||||||
|
get_param: DnsSearchDomains
|
||||||
addresses:
|
addresses:
|
||||||
- ip_netmask:
|
- ip_netmask:
|
||||||
list_join:
|
list_join:
|
||||||
|
|
|
@ -26,6 +26,10 @@ parameters:
|
||||||
EC2MetadataIp: # Override this via parameter_defaults
|
EC2MetadataIp: # Override this via parameter_defaults
|
||||||
description: The IP address of the EC2 metadata server.
|
description: The IP address of the EC2 metadata server.
|
||||||
type: string
|
type: string
|
||||||
|
DnsSearchDomains: # Override this via parameter_defaults
|
||||||
|
default: []
|
||||||
|
description: A list of DNS search domains to be added (in order) to resolv.conf.
|
||||||
|
type: comma_delimited_list
|
||||||
resources:
|
resources:
|
||||||
OsNetConfigImpl:
|
OsNetConfigImpl:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
|
@ -43,6 +47,8 @@ resources:
|
||||||
use_dhcp: false
|
use_dhcp: false
|
||||||
dns_servers:
|
dns_servers:
|
||||||
get_param: DnsServers
|
get_param: DnsServers
|
||||||
|
domain:
|
||||||
|
get_param: DnsSearchDomains
|
||||||
addresses:
|
addresses:
|
||||||
- ip_netmask:
|
- ip_netmask:
|
||||||
list_join:
|
list_join:
|
||||||
|
|
|
@ -21,6 +21,10 @@ parameters:
|
||||||
default: []
|
default: []
|
||||||
description: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf.
|
description: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf.
|
||||||
type: comma_delimited_list
|
type: comma_delimited_list
|
||||||
|
DnsSearchDomains: # Override this via parameter_defaults
|
||||||
|
default: []
|
||||||
|
description: A list of DNS search domains to be added (in order) to resolv.conf.
|
||||||
|
type: comma_delimited_list
|
||||||
resources:
|
resources:
|
||||||
OsNetConfigImpl:
|
OsNetConfigImpl:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
|
@ -41,6 +45,8 @@ resources:
|
||||||
use_dhcp: false
|
use_dhcp: false
|
||||||
dns_servers:
|
dns_servers:
|
||||||
get_param: DnsServers
|
get_param: DnsServers
|
||||||
|
domain:
|
||||||
|
get_param: DnsSearchDomains
|
||||||
addresses:
|
addresses:
|
||||||
- ip_netmask:
|
- ip_netmask:
|
||||||
list_join:
|
list_join:
|
||||||
|
|
|
@ -55,6 +55,10 @@ parameters:
|
||||||
EC2MetadataIp: # Override this via parameter_defaults
|
EC2MetadataIp: # Override this via parameter_defaults
|
||||||
description: The IP address of the EC2 metadata server.
|
description: The IP address of the EC2 metadata server.
|
||||||
type: string
|
type: string
|
||||||
|
DnsSearchDomains: # Override this via parameter_defaults
|
||||||
|
default: []
|
||||||
|
description: A list of DNS search domains to be added (in order) to resolv.conf.
|
||||||
|
type: comma_delimited_list
|
||||||
resources:
|
resources:
|
||||||
OsNetConfigImpl:
|
OsNetConfigImpl:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
|
@ -70,6 +74,10 @@ resources:
|
||||||
- type: interface
|
- type: interface
|
||||||
name: nic1
|
name: nic1
|
||||||
use_dhcp: false
|
use_dhcp: false
|
||||||
|
dns_servers:
|
||||||
|
get_param: DnsServers
|
||||||
|
domain:
|
||||||
|
get_param: DnsSearchDomains
|
||||||
addresses:
|
addresses:
|
||||||
- ip_netmask:
|
- ip_netmask:
|
||||||
list_join:
|
list_join:
|
||||||
|
|
|
@ -53,6 +53,10 @@ parameters:
|
||||||
EC2MetadataIp: # Override this via parameter_defaults
|
EC2MetadataIp: # Override this via parameter_defaults
|
||||||
description: The IP address of the EC2 metadata server.
|
description: The IP address of the EC2 metadata server.
|
||||||
type: string
|
type: string
|
||||||
|
DnsSearchDomains: # Override this via parameter_defaults
|
||||||
|
default: []
|
||||||
|
description: A list of DNS search domains to be added (in order) to resolv.conf.
|
||||||
|
type: comma_delimited_list
|
||||||
resources:
|
resources:
|
||||||
OsNetConfigImpl:
|
OsNetConfigImpl:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
|
@ -85,6 +89,8 @@ resources:
|
||||||
name: bridge_name
|
name: bridge_name
|
||||||
dns_servers:
|
dns_servers:
|
||||||
get_param: DnsServers
|
get_param: DnsServers
|
||||||
|
domain:
|
||||||
|
get_param: DnsSearchDomains
|
||||||
members:
|
members:
|
||||||
- type: ovs_bond
|
- type: ovs_bond
|
||||||
name: bond1
|
name: bond1
|
||||||
|
|
|
@ -51,6 +51,10 @@ parameters:
|
||||||
EC2MetadataIp: # Override this via parameter_defaults
|
EC2MetadataIp: # Override this via parameter_defaults
|
||||||
description: The IP address of the EC2 metadata server.
|
description: The IP address of the EC2 metadata server.
|
||||||
type: string
|
type: string
|
||||||
|
DnsSearchDomains: # Override this via parameter_defaults
|
||||||
|
default: []
|
||||||
|
description: A list of DNS search domains to be added (in order) to resolv.conf.
|
||||||
|
type: comma_delimited_list
|
||||||
{%- if role.name == 'ComputeOvsDpdk' %}
|
{%- if role.name == 'ComputeOvsDpdk' %}
|
||||||
NumDpdkInterfaceRxQueues:
|
NumDpdkInterfaceRxQueues:
|
||||||
description: Number of Rx Queues required for DPDK bond or DPDK ports
|
description: Number of Rx Queues required for DPDK bond or DPDK ports
|
||||||
|
@ -96,6 +100,8 @@ resources:
|
||||||
{% endif %}
|
{% endif %}
|
||||||
dns_servers:
|
dns_servers:
|
||||||
get_param: DnsServers
|
get_param: DnsServers
|
||||||
|
domain:
|
||||||
|
get_param: DnsSearchDomains
|
||||||
members:
|
members:
|
||||||
- type: ovs_bond
|
- type: ovs_bond
|
||||||
name: bond1
|
name: bond1
|
||||||
|
|
|
@ -47,6 +47,10 @@ parameters:
|
||||||
EC2MetadataIp: # Override this via parameter_defaults
|
EC2MetadataIp: # Override this via parameter_defaults
|
||||||
description: The IP address of the EC2 metadata server.
|
description: The IP address of the EC2 metadata server.
|
||||||
type: string
|
type: string
|
||||||
|
DnsSearchDomains: # Override this via parameter_defaults
|
||||||
|
default: []
|
||||||
|
description: A list of DNS search domains to be added (in order) to resolv.conf.
|
||||||
|
type: comma_delimited_list
|
||||||
resources:
|
resources:
|
||||||
OsNetConfigImpl:
|
OsNetConfigImpl:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
|
@ -64,6 +68,8 @@ resources:
|
||||||
use_dhcp: false
|
use_dhcp: false
|
||||||
dns_servers:
|
dns_servers:
|
||||||
get_param: DnsServers
|
get_param: DnsServers
|
||||||
|
domain:
|
||||||
|
get_param: DnsSearchDomains
|
||||||
addresses:
|
addresses:
|
||||||
- ip_netmask:
|
- ip_netmask:
|
||||||
list_join:
|
list_join:
|
||||||
|
|
|
@ -46,6 +46,10 @@ parameters:
|
||||||
EC2MetadataIp: # Override this via parameter_defaults
|
EC2MetadataIp: # Override this via parameter_defaults
|
||||||
description: The IP address of the EC2 metadata server.
|
description: The IP address of the EC2 metadata server.
|
||||||
type: string
|
type: string
|
||||||
|
DnsSearchDomains: # Override this via parameter_defaults
|
||||||
|
default: []
|
||||||
|
description: A list of DNS search domains to be added (in order) to resolv.conf.
|
||||||
|
type: comma_delimited_list
|
||||||
resources:
|
resources:
|
||||||
OsNetConfigImpl:
|
OsNetConfigImpl:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
|
@ -63,6 +67,8 @@ resources:
|
||||||
use_dhcp: false
|
use_dhcp: false
|
||||||
dns_servers:
|
dns_servers:
|
||||||
get_param: DnsServers
|
get_param: DnsServers
|
||||||
|
domain:
|
||||||
|
get_param: DnsSearchDomains
|
||||||
addresses:
|
addresses:
|
||||||
- ip_netmask:
|
- ip_netmask:
|
||||||
list_join:
|
list_join:
|
||||||
|
|
|
@ -45,6 +45,10 @@ parameters:
|
||||||
EC2MetadataIp: # Override this via parameter_defaults
|
EC2MetadataIp: # Override this via parameter_defaults
|
||||||
description: The IP address of the EC2 metadata server.
|
description: The IP address of the EC2 metadata server.
|
||||||
type: string
|
type: string
|
||||||
|
DnsSearchDomains: # Override this via parameter_defaults
|
||||||
|
default: []
|
||||||
|
description: A list of DNS search domains to be added (in order) to resolv.conf.
|
||||||
|
type: comma_delimited_list
|
||||||
{%- if role.name == 'ComputeOvsDpdk' %}
|
{%- if role.name == 'ComputeOvsDpdk' %}
|
||||||
NumDpdkInterfaceRxQueues:
|
NumDpdkInterfaceRxQueues:
|
||||||
description: Number of Rx Queues required for DPDK bond or DPDK ports
|
description: Number of Rx Queues required for DPDK bond or DPDK ports
|
||||||
|
@ -68,6 +72,8 @@ resources:
|
||||||
use_dhcp: false
|
use_dhcp: false
|
||||||
dns_servers:
|
dns_servers:
|
||||||
get_param: DnsServers
|
get_param: DnsServers
|
||||||
|
domain:
|
||||||
|
get_param: DnsSearchDomains
|
||||||
addresses:
|
addresses:
|
||||||
- ip_netmask:
|
- ip_netmask:
|
||||||
list_join:
|
list_join:
|
||||||
|
|
|
@ -46,6 +46,10 @@ parameters:
|
||||||
EC2MetadataIp: # Override this via parameter_defaults
|
EC2MetadataIp: # Override this via parameter_defaults
|
||||||
description: The IP address of the EC2 metadata server.
|
description: The IP address of the EC2 metadata server.
|
||||||
type: string
|
type: string
|
||||||
|
DnsSearchDomains: # Override this via parameter_defaults
|
||||||
|
default: []
|
||||||
|
description: A list of DNS search domains to be added (in order) to resolv.conf.
|
||||||
|
type: comma_delimited_list
|
||||||
resources:
|
resources:
|
||||||
OsNetConfigImpl:
|
OsNetConfigImpl:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
|
@ -63,6 +67,8 @@ resources:
|
||||||
use_dhcp: false
|
use_dhcp: false
|
||||||
dns_servers:
|
dns_servers:
|
||||||
get_param: DnsServers
|
get_param: DnsServers
|
||||||
|
domain:
|
||||||
|
get_param: DnsSearchDomains
|
||||||
addresses:
|
addresses:
|
||||||
- ip_netmask:
|
- ip_netmask:
|
||||||
list_join:
|
list_join:
|
||||||
|
|
|
@ -45,6 +45,10 @@ parameters:
|
||||||
EC2MetadataIp: # Override this via parameter_defaults
|
EC2MetadataIp: # Override this via parameter_defaults
|
||||||
description: The IP address of the EC2 metadata server.
|
description: The IP address of the EC2 metadata server.
|
||||||
type: string
|
type: string
|
||||||
|
DnsSearchDomains: # Override this via parameter_defaults
|
||||||
|
default: []
|
||||||
|
description: A list of DNS search domains to be added (in order) to resolv.conf.
|
||||||
|
type: comma_delimited_list
|
||||||
resources:
|
resources:
|
||||||
OsNetConfigImpl:
|
OsNetConfigImpl:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
|
@ -66,6 +70,8 @@ resources:
|
||||||
use_dhcp: false
|
use_dhcp: false
|
||||||
dns_servers:
|
dns_servers:
|
||||||
get_param: DnsServers
|
get_param: DnsServers
|
||||||
|
domain:
|
||||||
|
get_param: DnsSearchDomains
|
||||||
addresses:
|
addresses:
|
||||||
- ip_netmask:
|
- ip_netmask:
|
||||||
list_join:
|
list_join:
|
||||||
|
|
|
@ -49,6 +49,10 @@ parameters:
|
||||||
EC2MetadataIp: # Override this via parameter_defaults
|
EC2MetadataIp: # Override this via parameter_defaults
|
||||||
description: The IP address of the EC2 metadata server.
|
description: The IP address of the EC2 metadata server.
|
||||||
type: string
|
type: string
|
||||||
|
DnsSearchDomains: # Override this via parameter_defaults
|
||||||
|
default: []
|
||||||
|
description: A list of DNS search domains to be added (in order) to resolv.conf.
|
||||||
|
type: comma_delimited_list
|
||||||
resources:
|
resources:
|
||||||
OsNetConfigImpl:
|
OsNetConfigImpl:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
|
@ -66,6 +70,8 @@ resources:
|
||||||
use_dhcp: false
|
use_dhcp: false
|
||||||
dns_servers:
|
dns_servers:
|
||||||
get_param: DnsServers
|
get_param: DnsServers
|
||||||
|
domain:
|
||||||
|
get_param: DnsSearchDomains
|
||||||
addresses:
|
addresses:
|
||||||
- ip_netmask:
|
- ip_netmask:
|
||||||
list_join:
|
list_join:
|
||||||
|
|
|
@ -46,6 +46,10 @@ parameters:
|
||||||
EC2MetadataIp: # Override this via parameter_defaults
|
EC2MetadataIp: # Override this via parameter_defaults
|
||||||
description: The IP address of the EC2 metadata server.
|
description: The IP address of the EC2 metadata server.
|
||||||
type: string
|
type: string
|
||||||
|
DnsSearchDomains: # Override this via parameter_defaults
|
||||||
|
default: []
|
||||||
|
description: A list of DNS search domains to be added (in order) to resolv.conf.
|
||||||
|
type: comma_delimited_list
|
||||||
resources:
|
resources:
|
||||||
OsNetConfigImpl:
|
OsNetConfigImpl:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
|
@ -63,6 +67,8 @@ resources:
|
||||||
use_dhcp: false
|
use_dhcp: false
|
||||||
dns_servers:
|
dns_servers:
|
||||||
get_param: DnsServers
|
get_param: DnsServers
|
||||||
|
domain:
|
||||||
|
get_param: DnsSearchDomains
|
||||||
addresses:
|
addresses:
|
||||||
- ip_netmask:
|
- ip_netmask:
|
||||||
list_join:
|
list_join:
|
||||||
|
|
|
@ -45,6 +45,10 @@ parameters:
|
||||||
EC2MetadataIp: # Override this via parameter_defaults
|
EC2MetadataIp: # Override this via parameter_defaults
|
||||||
description: The IP address of the EC2 metadata server.
|
description: The IP address of the EC2 metadata server.
|
||||||
type: string
|
type: string
|
||||||
|
DnsSearchDomains: # Override this via parameter_defaults
|
||||||
|
default: []
|
||||||
|
description: A list of DNS search domains to be added (in order) to resolv.conf.
|
||||||
|
type: comma_delimited_list
|
||||||
resources:
|
resources:
|
||||||
OsNetConfigImpl:
|
OsNetConfigImpl:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
|
@ -66,6 +70,8 @@ resources:
|
||||||
use_dhcp: false
|
use_dhcp: false
|
||||||
dns_servers:
|
dns_servers:
|
||||||
get_param: DnsServers
|
get_param: DnsServers
|
||||||
|
domain:
|
||||||
|
get_param: DnsSearchDomains
|
||||||
addresses:
|
addresses:
|
||||||
- ip_netmask:
|
- ip_netmask:
|
||||||
list_join:
|
list_join:
|
||||||
|
|
Loading…
Reference in New Issue