diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml
index 57e4651b..24ca7dbd 100644
--- a/.zuul.d/jobs.yaml
+++ b/.zuul.d/jobs.yaml
@@ -139,6 +139,7 @@
       under nodepool, using source versions of dependencies such as
       nodepool, dib, openstacksdk and glean.
     parent: nodepool-functional-container-openstack-siblings-base
+    post-run: playbooks/dib-nodepool/collect-openstack-logs.yaml
     vars:
       nodepool_debug: true
 
diff --git a/playbooks/dib-nodepool/collect-openstack-logs.yaml b/playbooks/dib-nodepool/collect-openstack-logs.yaml
new file mode 100644
index 00000000..2bf319b8
--- /dev/null
+++ b/playbooks/dib-nodepool/collect-openstack-logs.yaml
@@ -0,0 +1,21 @@
+- hosts: all
+  tasks:
+    - name: Copy openstack logs
+      ignore_errors: yes
+      block:
+        - name: Make openstack logs dir
+          become: true
+          file:
+            path: /var/log/nodepool/openstack
+            state: directory
+            mode: '0755'
+        - name: Write out openstack logs
+          become: true
+          shell:
+            cmd: |
+              u=""
+              name=""
+              for u in $(systemctl list-unit-files | grep devstack | awk '{print $1}'); do
+                name=$(echo $u | sed 's/devstack@/screen-/' | sed 's/\.service//')
+                journalctl -o short-precise --unit $u  > /var/log/nodepool/openstack/$name.txt
+              done