diff --git a/tools/diag b/tools/diag
new file mode 100755
index 0000000000..a01d4752fa
--- /dev/null
+++ b/tools/diag
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+echo "##### System Identification #####"
+egrep -w 'PRETTY_NAME|VERSION_ID' /etc/os-release
+
+echo "##### Docker Version #####"
+docker --version
+
+echo "##### Docker Info #####"
+docker info
+
+echo "##### Ansible Version #####"
+ansible --version
+
+echo "##### List installed packages, including editables #####"
+pip list
+
+echo "##### Globals.yml file #####"
+egrep -w 'kolla_base_distro|kolla_install_type|openstack_release' /etc/kolla/globals.yml
+cat /etc/kolla/globals.yml | grep ^enable_
+
+echo "##### Docker Images #####"
+docker images -a --filter "label=kolla_version" --filter "dangling=false" --format "{{.ID}} - {{.Repository}}:{{.Tag}} - {{.CreatedSince}}"
+
+echo "##### All Docker Containers  #####"
+docker ps -a
+
+echo "##### Ip Link Show  #####"
+ip link show