diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2020-01-20 12:21:22 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2020-01-20 12:21:22 +0000 |
| commit | 294399f6436b56989e46c6d3ca5d3b4c69b51573 (patch) | |
| tree | ffddbf9460ea1aa775f3b5c3c91bc5bcde819214 | |
| parent | b4f1800025a33b950ff66ed6c7b5ef9e2315f778 (diff) | |
| parent | 2dc42cd75a3fc5ee4147c4180ba78ad415b09381 (diff) | |
Merge "all: Actually honor public DNS set in IDF" into stable/iruya
3 files changed, 15 insertions, 6 deletions
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 index b8c525822..57da919de 100644 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 @@ -122,12 +122,6 @@ parameters: ~kernel: sysctl: net.ipv4.ip_forward: 1 - network: - resolv: - dns: -{%- for server in nm.dns_public %} - - {{ server }} -{%- endfor %} iptables: schema: epoch: 1 diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/init.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/init.yml.j2 index 54f268226..2e88d9cdc 100644 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/init.yml.j2 +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/init.yml.j2 @@ -31,3 +31,10 @@ parameters: minion: tcp_keepalive: True tcp_keepalive_idle: 60 + linux: + network: + resolv: + dns: +{%- for server in nm.dns_public %} + - {{ server }} +{%- endfor %} diff --git a/mcp/scripts/docker-compose/docker-compose.yaml.j2 b/mcp/scripts/docker-compose/docker-compose.yaml.j2 index 82c4178b6..04dc93f98 100644 --- a/mcp/scripts/docker-compose/docker-compose.yaml.j2 +++ b/mcp/scripts/docker-compose/docker-compose.yaml.j2 @@ -37,6 +37,10 @@ services: hostname: cfg01 domainname: {{ conf.cluster.domain }} privileged: true + dns: +{%- for server in nm.dns_public %} + - {{ server }} +{%- endfor %} {%- if nm.cluster.has_baremetal_nodes %} opnfv-fuel-maas: container_name: "maas" @@ -63,6 +67,10 @@ services: hostname: mas01 domainname: {{ conf.cluster.domain }} privileged: true + dns: +{%- for server in nm.dns_public %} + - {{ server }} +{%- endfor %} ports: - 5240:5240 {%- endif %} |