"""
Initialize a new shell instance. Re-initializes globals.
"""
-
try:
# If any XML-RPC options have been specified, do not try
# connecting directly to the DB.
if not method or method == "capability":
# Load defaults from configuration file if using capability
# authentication.
+ method = "capability"
if user is None and self.config is not None:
user = self.config.nova_admin_user
if password is None and self.config is not None:
parser.add_option("-h", "--url", help = "API URL")
parser.add_option("-c", "--cacert", help = "API SSL certificate")
parser.add_option("-k", "--insecure", help = "Do not check SSL certificate")
-parser.add_option("-m", "--method", help = "API authentication method", default='capability')
+parser.add_option("-m", "--method", help = "API authentication method")
parser.add_option("-s", "--session", help = "API session key")
parser.add_option("-u", "--user", help = "API user name")
parser.add_option("-p", "--password", help = "API password")