Merge "authtoken: Make password required"

manifests/keystone/authtoken.pp

@@ -4,14 +4,13 @@
 #
 # === Parameters
 #
+# [*password*]
+#   (Required) Password to create for the service user
+#
 # [*username*]
 #   (Optional) The name of the service user
 #   Defaults to 'mistral'
 #
-# [*password*]
-#   (Optional) Password to create for the service user
-#   Defaults to $facts['os_service_default']
-#
 # [*auth_url*]
 #   (Optional) The URL to use for authentication.
 #   Defaults to 'http://localhost:5000'
@@ -196,8 +195,8 @@
 #  authtoken class. Values set here override the individual parameters above.
 #
 class mistral::keystone::authtoken(
+  String[1] $password,
   $username                       = 'mistral',
-  $password                       = $facts['os_service_default'],
   $auth_url                       = 'http://localhost:5000',
   $project_name                   = 'services',
   $user_domain_name               = 'Default',
@@ -238,10 +237,6 @@ class mistral::keystone::authtoken(
 
   include mistral::deps
 
-  if is_service_default($password) {
-    fail('Please set password for mistral service user')
-  }
-
   keystone::resource::authtoken {
     'mistral_config':
       *                              => $params;