diff --git a/manifests/site.pp b/manifests/site.pp
index 97eed376f7..d4b586fa37 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -105,6 +105,12 @@ node 'ci-puppetmaster.openstack.org' {
   }
 }
 
+node 'groups.openstack.org' {
+  class { 'openstack_project::groups':
+    sysadmins => hiera('sysadmins'),
+  }
+}
+
 node 'lists.openstack.org' {
   class { 'openstack_project::lists':
     listadmins => hiera('listadmins'),
diff --git a/modules/openstack_project/manifests/groups.pp b/modules/openstack_project/manifests/groups.pp
new file mode 100644
index 0000000000..7d38ae8643
--- /dev/null
+++ b/modules/openstack_project/manifests/groups.pp
@@ -0,0 +1,9 @@
+# User group management server
+class openstack_project::groups (
+  $sysadmins = []
+) {
+  class { 'openstack_project::server':
+    iptables_public_tcp_ports => [80, 443],
+    sysadmins                 => $sysadmins,
+  }
+}