From 049578d76cb0beb36a2355f43b17dd73559d582d Mon Sep 17 00:00:00 2001 From: Motohiro OTSUKA Date: Tue, 25 Nov 2014 14:09:05 +0900 Subject: [PATCH] Added default service type. This added default service type of Magnum which may be registered in Keystone service catalog. Change-Id: Ib0045af8b0e1e93cb3000b34a63a0a0747fdcdc5 --- magnumclient/api/client.py | 2 +- magnumclient/shell.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/magnumclient/api/client.py b/magnumclient/api/client.py index 74491abf..31e5f871 100644 --- a/magnumclient/api/client.py +++ b/magnumclient/api/client.py @@ -22,7 +22,7 @@ from magnumclient.api import httpclient class Client(object): def __init__(self, username=None, api_key=None, project_id=None, project_name=None, auth_url=None, magnum_url=None, - endpoint_type='publicURL', service_type='data_processing', + endpoint_type='publicURL', service_type='container', input_auth_token=None): if not input_auth_token: diff --git a/magnumclient/shell.py b/magnumclient/shell.py index 20c81483..e5d5ab7e 100644 --- a/magnumclient/shell.py +++ b/magnumclient/shell.py @@ -57,7 +57,7 @@ from magnumclient import version DEFAULT_API_VERSION = 'api' DEFAULT_ENDPOINT_TYPE = 'publicURL' -DEFAULT_SERVICE_TYPE = 'data_processing' +DEFAULT_SERVICE_TYPE = 'container' logger = logging.getLogger(__name__) @@ -279,7 +279,7 @@ class OpenStackMagnumShell(object): parser.add_argument('--service-type', metavar='', - help='Defaults to data_processing for all ' + help='Defaults to container for all ' 'actions.') parser.add_argument('--service_type', help=argparse.SUPPRESS)