[CORD-1650]
Refactor interface/bridge handling
Change-Id: I83fd9eb3e8440ba277b7b4d1ed41cb18347b6916
diff --git a/roles/dns-configure/defaults/main.yml b/roles/dns-configure/defaults/main.yml
index 19cc84c..b58fdbd 100644
--- a/roles/dns-configure/defaults/main.yml
+++ b/roles/dns-configure/defaults/main.yml
@@ -20,7 +20,10 @@
headnode_dns: head1
-management_net_cidr: "192.168.200.0/24"
+management_net_cidr: "10.1.0.0/24"
+
+use_maas: False
+use_openstack: True
# node lists
head_lxd_list: []
diff --git a/roles/dns-configure/tasks/main.yml b/roles/dns-configure/tasks/main.yml
index 5ea0418..88f6d9e 100644
--- a/roles/dns-configure/tasks/main.yml
+++ b/roles/dns-configure/tasks/main.yml
@@ -40,7 +40,8 @@
tags:
- skip_ansible_lint # needs to run before the DNS check which happens next, so can't be a handler
-- name: Check that VM's can be found in DNS
+- name: Check that Openstack LXD containers can be found in DNS
+ when: use_openstack
shell: "dig +short {{ item.name }}.{{ site_suffix }} | grep {{ item.ipv4_last_octet }}"
with_items: "{{ head_lxd_list }}"
tags:
diff --git a/roles/dns-configure/templates/base.j2 b/roles/dns-configure/templates/base.j2
index 0cc185b..435148d 100644
--- a/roles/dns-configure/templates/base.j2
+++ b/roles/dns-configure/templates/base.j2
@@ -1,4 +1,3 @@
-
{#
Copyright 2017-present Open Networking Foundation
@@ -14,8 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
#}
-
-
+# Created by dns-configure/templates/base.j2
{% if dns_search is defined %}
search{% for searchdom in dns_search %} {{ searchdom }}{% endfor %}
{% endif %}
diff --git a/roles/dns-configure/templates/head.j2 b/roles/dns-configure/templates/head.j2
index c3d39f4..a4f91b3 100644
--- a/roles/dns-configure/templates/head.j2
+++ b/roles/dns-configure/templates/head.j2
@@ -1,4 +1,3 @@
-
{#
Copyright 2017-present Open Networking Foundation
@@ -15,11 +14,10 @@
limitations under the License.
#}
-
# Dynamic resolv.conf(5) file for glibc resolver(3) generated by resolvconf(8)
# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
# Make changes to /etc/resolvconf/resolv.conf.d instead
-# Modified by Ansible
+# Created by dns-configure/templates/head.j2
{% if unbound_listen_on_default %}
{% for host in groups['head'] %}
nameserver {{ hostvars[host].ansible_default_ipv4.address }}