Merge "odl-ovs noha: Support VLAN tagged public"

diff --git a/mcp/config/states/opendaylight b/mcp/config/states/opendaylight
index eb6cc65..ae8b4cc 100755 (executable)
--- a/mcp/config/states/opendaylight
+++ b/mcp/config/states/opendaylight
@@ -21,5 +21,7 @@ wait_for 5.0 "salt -I 'opendaylight:server' state.sls opendaylight"
 wait_for 20 "salt --out yaml -C 'I@neutron:server and *01*' network.connect $(odl bind_ip) $(odl rest_port) | fgrep -q 'result: true'"
 
 # https://bugs.launchpad.net/networking-odl/+bug/1822559
+FILE=/usr/lib/python3/dist-packages/networking_odl/cmd/set_ovs_hostconfigs.py
+PFILE=/var/tmp/odl_hostconfig.patch
 salt -I 'linux:network:bridge:openvswitch' pkg.install python3-networking-odl
-salt -I 'linux:network:bridge:openvswitch' file.patch /usr/lib/python3/dist-packages/networking_odl/cmd/set_ovs_hostconfigs.py /var/tmp/odl_hostconfig.patch || true
+salt -I 'linux:network:bridge:openvswitch' cmd.run "patch -R -s --dry-run $FILE < $PFILE || patch $FILE < $PFILE"

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 b8c5258..57da919 100644 (file)
--- 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 54f2682..2e88d9c 100644 (file)
--- 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 82c4178..04dc93f 100644 (file)
--- 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 %}