diff --git a/cord-hosts b/cord-hosts
index a97e12e..c52b70b 100644
--- a/cord-hosts
+++ b/cord-hosts
@@ -1,5 +1,19 @@
 head    ansible_ssh_host=localhost connection=local
 
+[openstack]
+mysql
+rabbitmq-server
+keystone
+glance
+nova-cloud-controller
+openstack-dashboard
+ceilometer
+nagios
+neutron-api
+
+[openstack:vars]
+ansible_ssh_user=ubuntu
+
 [compute]
 node1
 node2
diff --git a/cord-test-hosts b/cord-test-hosts
index c41c275..8f01e1f 100644
--- a/cord-test-hosts
+++ b/cord-test-hosts
@@ -1,7 +1,21 @@
 head    ansible_ssh_host=localhost connection=local
 
+[openstack]
+mysql
+rabbitmq-server
+keystone
+glance
+nova-cloud-controller
+openstack-dashboard
+ceilometer
+nagios
+neutron-api
+
+[openstack:vars]
+ansible_ssh_user=ubuntu
+
 [compute]
 nova-compute ansible_ssh_user=ubuntu
 
 [all:vars]
-test_setup=true 
+test_setup=true