aboutsummaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
Diffstat (limited to 'mcp')
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j26
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/init.yml.j27
-rw-r--r--mcp/scripts/docker-compose/docker-compose.yaml.j28
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 %}