diff --git a/aztest-playbook.yml b/aztest-playbook.yml
index 837c14a..347e8ec 100644
--- a/aztest-playbook.yml
+++ b/aztest-playbook.yml
@@ -1,10 +1,35 @@
 ---
-# aztest playbook, for installing OpenCloud
+# aztest playbook, for installing an OpenCloud site
 
-# Prepare the head node and install juju
+- hosts: all
+  tasks:
+  - include_vars: vars/opencloud_defaults.yml
+  - include_vars: vars/aztest.yml
+
+# common setup
+- hosts: all
+  become: yes
+  roles:
+    - common-prep
+    - dell-virt
+
+# Install DNS servers on the head node
+- hosts: head
+  become: yes
+  roles:
+    - dns-nsd
+    - dns-unbound
+
+# Configure DNS serves on all 
+
+- hosts: all
+  become: yes
+  roles:
+    - dns-configure
+
+# prepare the head node, install juju
 - hosts: head
   roles:
-    - { role: common-prep, become: yes }
     - { role: head-prep, become: yes }
     - juju-user-prep
     - juju-setup
@@ -13,10 +38,9 @@
 - hosts: compute
   become: yes
   roles:
-    - { role: common-prep, become: yes }
-    - { role: compute-prep, become: yes }
+    - compute-prep
 
-# Finish the openstack config on head (needs compute nodes up to finish)
+# configure openstack on head node, including compute nodes
 - hosts: head
   roles:
     - juju-openstack-config
diff --git a/group_vars/aztest.yml b/group_vars/aztest.yml
deleted file mode 100644
index ef3310d..0000000
--- a/group_vars/aztest.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-# file: group_vars/aztest.yml
-
-mgmt_net_prefix: 192.168.250
-cloudlab: false
-
diff --git a/inventory/aztest b/inventory/aztest
index d7e8cd4..e8ff1fa 100644
--- a/inventory/aztest
+++ b/inventory/aztest
@@ -2,7 +2,9 @@
 ansible_ssh_user=ubuntu
 
 [head]
-node11.opencloud.cs.arizona.edu
+node09.opencloud.cs.arizona.edu
 
 [compute]
+node10.opencloud.cs.arizona.edu
+node11.opencloud.cs.arizona.edu
 node12.opencloud.cs.arizona.edu
diff --git a/roles/juju-setup/defaults/main.yml b/roles/juju-setup/defaults/main.yml
index 6b09858..cd21505 100644
--- a/roles/juju-setup/defaults/main.yml
+++ b/roles/juju-setup/defaults/main.yml
@@ -1,140 +1,2 @@
 ---
-# roles/juju-setup/defaults/main.yml
-
-openstack_version: kilo
-
-openstack_cfg_path: /usr/local/src/openstack.cfg
-
-head_vm_list:
-  - name: "juju"
-    cpu: "1"
-    memMB: "2048"
-    diskGB: "20"
-
-  - name: "ceilometer"
-    cpu: "1"
-    memMB: "2048"
-    diskGB: "20"
-    forwarded_ports:
-      - { ext: 8777, int: 8777 }
-
-  - name: "glance"
-    cpu: "2"
-    memMB: "4096"
-    diskGB: "160"
-    forwarded_ports:
-      - { ext: 9292, int: 9292 }
-
-  - name: "keystone"
-    cpu: "2"
-    memMB: "4096"
-    diskGB: "40"
-    forwarded_ports:
-      - { ext: 35357, int: 35357 }
-      - { ext: 4990, int: 4990 }
-      - { ext: 5000, int: 5000 }
-
-  - name: "mysql"
-    cpu: "2"
-    memMB: "4096"
-    diskGB: "40"
-
-  - name: "nagios"
-    cpu: "1"
-    memMB: "2048"
-    diskGB: "20"
-    forwarded_ports:
-      - { ext: 3128, int: 80 }
-
-  - name: "neutron-api"
-    cpu: "2"
-    memMB: "4096"
-    diskGB: "40"
-    forwarded_ports:
-      - { ext: 9696, int: 9696 }
-
-  - name: "neutron-gateway"
-    cpu: "2"
-    memMB: "4096"
-    diskGB: "40"
-
-  - name: "nova-cloud-controller"
-    cpu: "2"
-    memMB: "4096"
-    diskGB: "40"
-    forwarded_ports:
-      - { ext: 8774, int: 8774 }
-
-  - name: "openstack-dashboard"
-    cpu: "1"
-    memMB: "2048"
-    diskGB: "20"
-    forwarded_ports:
-      - { ext: 8080, int: 80 }
-
-  - name: "rabbitmq-server"
-    cpu: "2"
-    memMB: "4096"
-    diskGB: "40"
-
-vm_service_list:
-  - ceilometer
-  - glance
-  - keystone
-  - mysql
-  - nagios
-  - neutron-api
-  - neutron-gateway
-  - nova-cloud-controller
-  - openstack-dashboard
-  - rabbitmq-server
-
-standalone_service_list:
-  - ntp
-  - nrpe
-  - ceilometer-agent
-  - neutron-openvswitch
-
-service_relations:
-  - name: keystone
-    relations: [ "mysql", "nrpe", ]
-
-  - name: nova-cloud-controller
-    relations: [ "mysql", "rabbitmq-server", "glance", "keystone", "nrpe", ]
-
-  - name: glance
-    relations: [ "mysql", "keystone", "nrpe", ]
-
-  - name: neutron-gateway
-    relations: [ "neutron-api", "nova-cloud-controller", "mysql", "nrpe", ]
-
-  - name: "neutron-gateway:amqp"
-    relations: [ "rabbitmq-server:amqp", ]
-
-  - name: neutron-api
-    relations: [ "keystone", "neutron-openvswitch", "mysql", "rabbitmq-server", "nova-cloud-controller", "nrpe", ]
-
-  - name: neutron-openvswitch
-    relations: [ "rabbitmq-server", ]
-
-  - name: openstack-dashboard
-    relations: [ "keystone", "nrpe", ]
-
-  - name: nagios
-    relations: [ "nrpe", ]
-
-  - name: "mysql:juju-info"
-    relations: [ "nrpe:general-info", ]
-
-  - name: rabbitmq-server
-    relations: [ "nrpe", ]
-
-  - name: ceilometer
-    relations: [ "mongodb", "rabbitmq-server", "nagios", "nrpe", ]
-
-  - name: "ceilometer:identity-service"
-    relations: [ "keystone:identity-service", ]
-
-  - name: "ceilometer:ceilometer-service"
-    relations: [ "ceilometer-agent:ceilometer-service", ]
 
diff --git a/vars/aztest.yml b/vars/aztest.yml
new file mode 100644
index 0000000..4e37651
--- /dev/null
+++ b/vars/aztest.yml
@@ -0,0 +1,20 @@
+---
+# file: group_vars/aztest.yml
+
+# Prefix for DNS zones
+mgmt_net_prefix: 192.168.250
+
+# NSD/Unbound settings
+
+nsd_zones:
+  - name: aztest.infra.opencloud.us
+    ipv4_first_octets: 192.168.250
+    name_reverse_unbound: "168.192.in-addr.arpa"
+    soa: ns1
+    ns:
+      - { name: ns1 }
+    nodelist: head_vm_list
+
+unbound_interfaces:
+  #  - 192.168.250.1/24
+  - 206.207.253.10/28
diff --git a/vars/opencloud_defaults.yml b/vars/opencloud_defaults.yml
index abded86..2d3ef92 100644
--- a/vars/opencloud_defaults.yml
+++ b/vars/opencloud_defaults.yml
@@ -5,15 +5,17 @@
 openstack_cfg_path: /usr/local/src/openstack.cfg
 
 head_vm_list:
-  - name: "juju"
-    hostname: "juju-1"
+  - name: "juju-1"
+    aliases:
+       - "juju"
     ipv4_last_octet: 10
     cpu: 1
     memMB: 2048
     diskGB: 20
 
-  - name: "ceilometer"
-    hostname: "ceilometer-1"
+  - name: "ceilometer-1"
+    aliases:
+      - "ceilometer"
     ipv4_last_octet: 20
     cpu: 1
     memMB: 2048
@@ -21,8 +23,9 @@
     forwarded_ports:
       - { ext: 8777, int: 8777 }
 
-  - name: "glance"
-    hostname: "glance-1"
+  - name: "glance-1"
+    aliases:
+      - "glance"
     ipv4_last_octet: 30
     cpu: 2
     memMB: 4096
@@ -30,8 +33,9 @@
     forwarded_ports:
       - { ext: 9292, int: 9292 }
 
-  - name: "keystone"
-    hostname: "keystone-1"
+  - name: "keystone-1"
+    aliases:
+      - "keystone"
     ipv4_last_octet: 40
     cpu: 2
     memMB: 4096
@@ -41,15 +45,17 @@
       - { ext: 4990, int: 4990 }
       - { ext: 5000, int: 5000 }
 
-  - name: "mysql"
-    hostname: "mysql-1"
+  - name: "mysql-1"
+    aliases:
+      - "mysql"
     ipv4_last_octet: 50
     cpu: 2
     memMB: 4096
     diskGB: 40
 
-  - name: "nagios"
-    hostname: "nagios-1"
+  - name: "nagios-1"
+    aliases:
+      - "nagios"
     ipv4_last_octet: 60
     cpu: 1
     memMB: 2048
@@ -57,8 +63,9 @@
     forwarded_ports:
       - { ext: 3128, int: 80 }
 
-  - name: "neutron-api"
-    hostname: "neutron-api-1"
+  - name: "neutron-api-1"
+    aliases:
+      - "neutron-api"
     ipv4_last_octet: 70
     cpu: 2
     memMB: 4096
@@ -66,15 +73,17 @@
     forwarded_ports:
       - { ext: 9696, int: 9696 }
 
-  - name: "neutron-gateway"
-    hostname: "neutron-gateway-1"
+  - name: "neutron-gateway-1"
+    aliases:
+      - "neutron-gateway"
     ipv4_last_octet: 80
     cpu: 2
     memMB: 4096
     diskGB: 40
 
-  - name: "nova-cloud-controller"
-    hostname: "nova-cloud-controller-1"
+  - name: "nova-cloud-controller-1"
+    aliases:
+      - "nova-cloud-controller"
     ipv4_last_octet: 90
     cpu: 2
     memMB: 4096
@@ -82,18 +91,20 @@
     forwarded_ports:
       - { ext: 8774, int: 8774 }
 
-  - name: "openstack-dashboard"
-    hostname: "openstack-dashboard-1"
-    ipv4_last_octet: 90
+  - name: "openstack-dashboard-1"
+    aliases:
+      - "openstack-dashboard"
+    ipv4_last_octet: 100
     cpu: 1
     memMB: 2048
     diskGB: 20
     forwarded_ports:
       - { ext: 8080, int: 80 }
 
-  - name: "rabbitmq-server"
-    hostname: "rabbitmq-server-1"
-    ipv4_last_octet: 100
+  - name: "rabbitmq-server-1"
+    aliases:
+      - "rabbitmq-server"
+    ipv4_last_octet: 110
     cpu: 2
     memMB: 4096
     diskGB: 40