diff --git a/vars/aztest.yml b/vars/aztest.yml
index c56f092..13702f4 100644
--- a/vars/aztest.yml
+++ b/vars/aztest.yml
@@ -25,6 +25,12 @@
     ns:
       - { name: ns1 }
     nodelist: head_vm_list
+    aliases:
+      - { name: "ns1" , dest: "head" }
+      - { name: "ns" , dest: "head" }
+      - { name: "apt-cache" , dest: "head" }
+
+name_on_public_interface: head
 
 # If true, unbound listens on the head node's `ansible_default_ipv4` interface
 unbound_listen_on_default: True
diff --git a/vars/cord.yml b/vars/cord.yml
index 07136e3..c04f7a0 100644
--- a/vars/cord.yml
+++ b/vars/cord.yml
@@ -33,7 +33,6 @@
 # If true, unbound listens on the head node's `ansible_default_ipv4` interface
 unbound_listen_on_default: True
 
-
 xos_images:
   - name: "trusty-server-multi-nic"
     url: "http://www.vicci.org/opencloud/trusty-server-cloudimg-amd64-disk1.img"
@@ -47,3 +46,5 @@
 
 # turn this on, or override when running playbook with --extra-vars="on_cloudlab=True"
 on_cloudlab: False
+
+
diff --git a/vars/cord_defaults.yml b/vars/cord_defaults.yml
index 12ce207..b91f082 100644
--- a/vars/cord_defaults.yml
+++ b/vars/cord_defaults.yml
@@ -2,7 +2,9 @@
 # vars/cord_defaults.yml
 
 # turn this off, or override when running playbook with --extra-vars="on_maas=False"
-on_maas: True
+on_maas: true
+
+run_dist_upgrade: false
 
 maas_node_key: /etc/maas/ansible/id_rsa
 
diff --git a/vars/cord_single_defaults.yml b/vars/cord_single_defaults.yml
index d16be78..05caf85 100644
--- a/vars/cord_single_defaults.yml
+++ b/vars/cord_single_defaults.yml
@@ -3,7 +3,9 @@
 
 # For a single-node case, we don't expect the node to already have been
 # provisioned by CORD MaaS.  It's just Ubuntu 14.04.
-on_maas: False
+on_maas: false
+
+run_dist_upgrade: false
 
 openstack_version: kilo
 
diff --git a/vars/opencloud_defaults.yml b/vars/opencloud_defaults.yml
index 32ca9a8..3f9bf90 100644
--- a/vars/opencloud_defaults.yml
+++ b/vars/opencloud_defaults.yml
@@ -1,10 +1,21 @@
 ---
 # vars/opencloud_defaults.yml
 
+on_maas: false
+
+run_dist_upgrade: true
+
 openstack_version: kilo
 
 juju_config_name: opencloud
 
+apt_cacher_name: apt-cache
+
+xos_images:
+  - name: "trusty-server-multi-nic"
+    url: "http://www.vicci.org/opencloud/trusty-server-cloudimg-amd64-disk1.img"
+    checksum: "sha256:c2d0ffc937aeb96016164881052a496658efeb98959dc68e73d9895c5d9920f7"
+
 charm_versions: {}
 
 head_vm_list:
@@ -152,7 +163,7 @@
     relations: [ "percona-cluster", "keystone", "nrpe", ]
 
   - name: neutron-gateway
-    relations: [ "neutron-api", "nova-cloud-controller", "percona-cluster", "nrpe", ]
+    relations: [ "neutron-api", "nova-cloud-controller", "nrpe", ]
 
   - name: "neutron-gateway:amqp"
     relations: [ "rabbitmq-server:amqp", ]
@@ -184,4 +195,16 @@
   - name: "ceilometer:ceilometer-service"
     relations: [ "ceilometer-agent:ceilometer-service", ]
 
+compute_relations:
+  - name: nova-compute
+    relations: [ "ceilometer-agent", "glance", "nova-cloud-controller", "nagios", "nrpe", ]
+
+  - name: "nova-compute:shared-db"
+    relations: [ "percona-cluster:shared-db", ]
+
+  - name: "nova-compute:amqp"
+    relations: [ "rabbitmq-server:amqp", ]
+
+  - name: ntp
+    relations: [ "nova-compute", ]