Merge "Add missing user-id option to generic.Password"

keystoneclient/auth/identity/generic/password.py

@@ -25,6 +25,7 @@ LOG = logging.getLogger(__name__)
 
 def get_options():
     return [
+        cfg.StrOpt('user-id', help='User id'),
         cfg.StrOpt('user-name', dest='username', help='Username',
                    deprecated_name='username'),
         cfg.StrOpt('user-domain-id', help="User's domain id"),

keystoneclient/tests/auth/test_password.py

@@ -45,6 +45,7 @@ class PasswordTests(utils.GenericPluginTestCase):
         allowed_opts = ['user-name',
                         'user-domain-id',
                         'user-domain-name',
+                        'user-id',
                         'password',
 
                         'domain-id',