Merge pull request #477 from puppetlabs/CAT-1939-reverting-deferred-function-changes

(CAT-1939) Reverting deferred function changes

Author: Ramesh7

manifests/login.pp

@@ -80,10 +80,7 @@
     $create_delete_login_parameters = {
       'disabled'          => $disabled,
       'login'             => $login,
-      'password'          => $password ? {
-        undef => undef,
-        default => Deferred('sprintf', [$password]),
-      },
+      'password'          => $password,
       'check_expiration'  => $check_expiration,
       'check_policy'      => $check_policy,
       'default_language'  => $default_language,
@@ -111,7 +108,7 @@
 
   sqlserver_tsql { "login-${instance}-${login}":
     instance => $instance,
-    command  => stdlib::deferrable_epp("sqlserver/${_create_delete}/login.sql.epp", $create_delete_login_parameters),
+    command  => epp("sqlserver/${_create_delete}/login.sql.epp", $create_delete_login_parameters),
     onlyif   => epp('sqlserver/query/login_exists.sql.epp', $query_login_exists_parameters),
     require  => Sqlserver::Config[$instance],
   }

manifests/user.pp

@@ -65,10 +65,7 @@
   if $create_delete == 'create' {
     $create_delete_user_parameters = {
       'database'        => $database,
-      'password'        => $password ? {
-        undef => undef,
-        default => Deferred('sprintf', [$password]),
-      },
+      'password'        => $password,
       'user'            => $user,
       'login'           => $login,
       'default_schema'  => $default_schema,
@@ -88,7 +85,7 @@
 
   sqlserver_tsql { "user-${instance}-${database}-${user}":
     instance => $instance,
-    command  => stdlib::deferrable_epp("sqlserver/${create_delete}/user.sql.epp", $create_delete_user_parameters),
+    command  => epp("sqlserver/${create_delete}/user.sql.epp", $create_delete_user_parameters),
     onlyif   => epp('sqlserver/query/user_exists.sql.epp', $query_user_exists_parameters),
     require  => Sqlserver::Config[$instance],
   }