diff --git a/doc/source/openstack-health.rst b/doc/source/openstack-health.rst
new file mode 100644
index 0000000000..d3bf22a652
--- /dev/null
+++ b/doc/source/openstack-health.rst
@@ -0,0 +1,41 @@
+:title: openstack-health
+
+.. _openstack-health:
+
+OpenStack-Health
+################
+
+At a Glance
+===========
+
+:Hosts:
+  * API Server: http://health.openstack.org
+  * Fronted: http://status.openstack.org/openstack-health
+:Puppet:
+  * https://git.openstack.org/cgit/openstack-infra/puppet-openstack_health/tree/
+  * :file:`modules/openstack_project/manifests/openstack_health_api.pp`
+  * :file:`modules/openstack_project/manifests/status.pp`
+:Configuration:
+  * :file:`modules/openstack_project/files/git/cgitrc`
+:Projects:
+  * https://git.openstack.org/cgit/openstack/openstack-health/tree
+
+Overview
+========
+
+The OpenStack Health dashboard provides a view of the status of all the tests
+running in our continuous integration infrastructure that we collect results
+data in subunit2sql for. It is composed of 2 pieces:
+
+#. The REST API that provides the data used for the dashboard visualizations
+#. The JS frontend which is used to visualize the data returned by the REST
+   API
+
+The REST API is deployed on it's own server. It is written in python using flask
+and is deployed using mod_wsgi under apache.
+
+The frontend component is deployed on status.openstack.org.
+
+Both components are continually deployed from the project repo, so as soon
+as a commit lands in the openstack-health repo it will be applied to the
+deployment.
diff --git a/doc/source/systems.rst b/doc/source/systems.rst
index 26c3142151..898585baf5 100644
--- a/doc/source/systems.rst
+++ b/doc/source/systems.rst
@@ -36,6 +36,7 @@ Major Systems
    askbot
    apps_site
    translate
+   openstack-health
    refstack
    codesearch