diff --git a/modules/openstack_project/manifests/infracloud/controller.pp b/modules/openstack_project/manifests/infracloud/controller.pp
index 9ca3e750f7..4060d8db66 100644
--- a/modules/openstack_project/manifests/infracloud/controller.pp
+++ b/modules/openstack_project/manifests/infracloud/controller.pp
@@ -38,4 +38,14 @@ class openstack_project::infracloud::controller (
     controller_management_address    => $controller_management_address,
     controller_public_address        => $controller_public_address,
   }
+
+  keystone_tenant { 'openstackci':
+    ensure      => present,
+    enabled     => true,
+  }
+
+  keystone_tenant { 'openstackjenkins':
+    ensure      => present,
+    enabled     => true,
+  }
 }