Merge "Set default auth plugin back to 'password'"

Author: Jenkins

openstackclient/shell.py

@@ -205,7 +205,7 @@ def initialize_app(self, argv):
             # Use service token authentication
             auth_type = 'token_endpoint'
         else:
-            auth_type = 'osc_password'
+            auth_type = 'password'
 
         project_id = getattr(self.options, 'project_id', None)
         project_name = getattr(self.options, 'project_name', None)