diff --git a/modules/openstack_project/manifests/users_install.pp b/modules/openstack_project/manifests/users_install.pp
new file mode 100644
index 0000000000..24eef91e5c
--- /dev/null
+++ b/modules/openstack_project/manifests/users_install.pp
@@ -0,0 +1,43 @@
+# Class: openstack_project::users_install
+#
+# This class handles adding and removing openstack admin users
+# from the servers.
+#
+# Parameters:
+#   install_users - Boolean to set install or removal of O.O
+#   admins.  Defaults to 'false', can be set in hiera.
+#
+# Requires:
+#   openstack_project::users - must contain the users designated.
+#
+# Sample Usage:
+#   include openstack_project::users_install
+#   class { 'openstack_project::users_install':
+#     install_users => true,
+#   }
+
+class openstack_project::users_install (
+  $install_users = false,
+) {
+
+  include openstack_project::users
+
+  ## TODO: this should be it's own manifest.
+  if ( $install_users == true ) {
+    package { $::openstack_project::params::user_packages:
+      ensure => present
+    }
+    realize (
+      User::Virtual::Localuser['mordred'],
+      User::Virtual::Localuser['corvus'],
+      User::Virtual::Localuser['clarkb'],
+      User::Virtual::Localuser['fungi'],
+    )
+  } else {
+      user::virtual::disable{'mordred':}
+      user::virtual::disable{'corvus':}
+      user::virtual::disable{'clarkb':}
+      user::virtual::disable{'fungi':}
+  }
+}
+