diff --git a/tools/deploy_aio.sh b/tools/deploy_aio.sh
index 74d5b617a5..3cd3bda29b 100755
--- a/tools/deploy_aio.sh
+++ b/tools/deploy_aio.sh
@@ -8,7 +8,14 @@ export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 export KOLLA_BASE=$1
 export KOLLA_TYPE=$2
 
+function copy_logs {
+    docker cp rsyslog:/var/log/ /tmp/logs
+}
+
 function check_failure {
+    # Command failures after this point can be expected
+    set +o errexit
+
     docker ps -a
     failed_containers=$(docker ps -a --format "{{.Names}}" --filter status=exited)
 
@@ -16,13 +23,18 @@ function check_failure {
         docker logs --tail all ${failed}
     done
 
-    journalctl --no-pager -u docker.service || :
-    cat /var/log/upstart/docker.log || :
+    journalctl --no-pager -u docker.service
+    cat /var/log/upstart/docker.log
 
-    if [[ -n ${failed_containers} ]]; then
-        echo 'FAILED'
-        exit 1
-    fi
+    nova service-list
+    neutron agent-list
+
+    nova list
+    nova list | awk '/4/ {print $2}' | xargs -n1 nova show
+
+    # NOTE(SamYaple): The copy logs functions is put on hold until Heka is all
+    # merged in. At that point we will pull the logs from Heka's volume
+    #copy_logs
 }
 
 function write_configs {
@@ -38,6 +50,11 @@ network_interface: "eth0"
 neutron_external_interface: "fake_interface"
 enable_horizon: "no"
 enable_heat: "no"
+EOF
+
+    cat << EOF > /etc/kolla/config/nova-compute.conf
+[libvirt]
+virt_type=qemu
 EOF
 
     cat << EOF > /etc/kolla/config/nova.conf
@@ -69,5 +86,14 @@ ip l a fake_interface type dummy
 
 # Actually do the deployment
 tools/kolla-ansible -vvv deploy
+tools/kolla-ansible -vvv post-deploy
 
-# TODO(SamYaple): Actually do functional testing of OpenStack
+# Test OpenStack Environment
+source /etc/kolla/admin-openrc.sh
+tools/init-runonce
+# Wait for service ready
+sleep 15
+nova boot --poll --image $(openstack image list | awk '/cirros/ {print $2}') --nic net-id=$(openstack network list | awk '/demo-net/ {print $2}') --flavor 1 kolla_boot_test
+
+# If the status is not ACTIVE, print info and exit 1
+nova show kolla_boot_test | awk '{buf=buf"\n"$0} $2=="status" && $4!="ACTIVE" {failed="yes"}; END {if (failed=="yes") {print buf; exit 1}}'
diff --git a/tools/setup_gate.sh b/tools/setup_gate.sh
index c701e10edd..a8cd2836c6 100755
--- a/tools/setup_gate.sh
+++ b/tools/setup_gate.sh
@@ -81,7 +81,8 @@ function setup_ansible {
     RAW_INVENTORY=/tmp/kolla/raw_inventory
     mkdir /tmp/kolla
 
-    sudo -H pip install "ansible<2" "docker-py>=1.6.0"
+    # TODO(SamYaple): Move to virtualenv
+    sudo -H pip install -U "ansible<2" "docker-py>=1.6.0" "python-openstackclient" "python-neutronclient"
     detect_distro
 
     setup_inventory