diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp
index 01a3e9c..526f938 100644
--- a/manifests/keystone/auth.pp
+++ b/manifests/keystone/auth.pp
@@ -75,23 +75,23 @@
 #   Defaults to 'http://127.0.0.1:9322'
 #
 class watcher::keystone::auth (
-  $password,
-  $auth_name           = 'watcher',
-  $email               = 'watcher@localhost',
-  $tenant              = 'services',
-  $roles               = ['admin'],
-  $system_scope        = 'all',
-  $system_roles        = [],
-  $configure_endpoint  = true,
-  $configure_user      = true,
-  $configure_user_role = true,
-  $service_name        = undef,
-  $service_description = 'Infrastructure Optimization service',
-  $service_type        = 'infra-optim',
-  $region              = 'RegionOne',
-  $public_url          = 'http://127.0.0.1:9322',
-  $admin_url           = 'http://127.0.0.1:9322',
-  $internal_url        = 'http://127.0.0.1:9322',
+  String[1] $password,
+  String[1] $auth_name                    = 'watcher',
+  String[1] $email                        = 'watcher@localhost',
+  String[1] $tenant                       = 'services',
+  Array[String[1]] $roles                 = ['admin'],
+  String[1] $system_scope                 = 'all',
+  Array[String[1]] $system_roles          = [],
+  Boolean $configure_endpoint             = true,
+  Boolean $configure_user                 = true,
+  Boolean $configure_user_role            = true,
+  Optional[String[1]] $service_name       = undef,
+  String[1] $service_description          = 'Infrastructure Optimization service',
+  String[1] $service_type                 = 'infra-optim',
+  String[1] $region                       = 'RegionOne',
+  Keystone::PublicEndpointUrl $public_url = 'http://127.0.0.1:9322',
+  Keystone::EndpointUrl $admin_url        = 'http://127.0.0.1:9322',
+  Keystone::EndpointUrl $internal_url     = 'http://127.0.0.1:9322',
 ) {
 
   include watcher::deps