diff options
| author |   Bartek Grzybowski <b.grzybowski@partner.samsung.com> | 2020-12-17 16:41:17 +0100 |
|---|---|---|
| committer | Bartek Grzybowski <b.grzybowski@partner.samsung.com> | 2020-12-30 10:13:26 +0000 |
| commit | 73a3f83c7356164c99afdc9057c5c2fa32fbde6a (patch) | |
| tree | 179514049dc935ccd0dd2feceaa67b0f1796c039 | |
| parent | fa807fc95ae404f9bdd2f0ed80906ea96bc79a46 (diff) | |
Support setting custom dns resolver
This change allows setting custom dns resolvers on control node
and all k8s hosts.
Change-Id: I49db6e5d5d3b5be5082adc73810eb282dce14eed
Issue-ID: OOM-2650
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
| -rw-r--r-- | tools/cicdansible/group_vars/all.yml | 2 | ||||
| -rw-r--r-- | tools/cicdansible/heat/installer.yaml | 5 | ||||
| -rw-r--r-- | tools/cicdansible/roles/setup_openstack_infrastructure/tasks/deploy/heat.yml | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/tools/cicdansible/group_vars/all.yml b/tools/cicdansible/group_vars/all.yml index e4265b11..ef23eb98 100644 --- a/tools/cicdansible/group_vars/all.yml +++ b/tools/cicdansible/group_vars/all.yml @@ -37,6 +37,8 @@ subnet_range_start: "10.1.0.4" subnet_range_end: "10.1.0.254" #Ip address of router used as a gateway to external network. router_addr: "10.1.0.1" +#A list of dns resolvers for all instances +dns_nameservers: [] #Cidr of external subnet to allow access to, 0.0.0.0/0 means allow internet access. # For offline deployment it is recommended to set this to a cidr of intranet. external_subnet_cidr: "" diff --git a/tools/cicdansible/heat/installer.yaml b/tools/cicdansible/heat/installer.yaml index 1f65f73f..b7b03d1a 100644 --- a/tools/cicdansible/heat/installer.yaml +++ b/tools/cicdansible/heat/installer.yaml @@ -58,6 +58,10 @@ parameters: type: string constraints: - custom_constraint: ip_addr + dns_nameservers: + label: "dns resolvers" + description: "List of dns resolvers" + type: comma_delimited_list public_network_name: label: "name of the public network" description: "Name of the public, internet facing network, also allowing access to company internal hosts" @@ -140,6 +144,7 @@ resources: allocation_pools: - { start: { get_param: subnet_range_start }, end: { get_param: subnet_range_end } } gateway_ip: { get_param: router_addr } + dns_nameservers: { get_param: dns_nameservers } ip_version: 4 #A port connected to the private network, taken by router. routerport: diff --git a/tools/cicdansible/roles/setup_openstack_infrastructure/tasks/deploy/heat.yml b/tools/cicdansible/roles/setup_openstack_infrastructure/tasks/deploy/heat.yml index 25e7ac79..21dfadcf 100644 --- a/tools/cicdansible/roles/setup_openstack_infrastructure/tasks/deploy/heat.yml +++ b/tools/cicdansible/roles/setup_openstack_infrastructure/tasks/deploy/heat.yml @@ -24,6 +24,7 @@ subnet_range_start: "{{ subnet_range_start }}" subnet_range_end: "{{ subnet_range_end }}" router_addr: "{{ router_addr }}" + dns_nameservers: "{{ dns_nameservers }}" auth_key: "{{ auth_public_key }}" image_name: "{{ image_name }}" node_flavor_name: "{{ node_flavor_name }}" |