diff --git a/modules/openstack_project/manifests/infracloud/controller.pp b/modules/openstack_project/manifests/infracloud/controller.pp
index 4060d8db66..238b96a488 100644
--- a/modules/openstack_project/manifests/infracloud/controller.pp
+++ b/modules/openstack_project/manifests/infracloud/controller.pp
@@ -39,13 +39,22 @@ class openstack_project::infracloud::controller (
     controller_public_address        => $controller_public_address,
   }
 
+  keystone_domain { 'infra':
+    ensure  => present,
+    enabled => true,
+  }
+
   keystone_tenant { 'openstackci':
     ensure      => present,
     enabled     => true,
+    domain      => 'infra',
+    require     => Keystone_domain['infra'],
   }
 
   keystone_tenant { 'openstackjenkins':
     ensure      => present,
     enabled     => true,
+    domain      => 'infra',
+    require     => Keystone_domain['infra'],
   }
 }