openstack/python-magnumclient
Code Issues Proposed changes

Added default service type.

Browse Source 
This added default service type of Magnum which may be registered
in Keystone service catalog.

Change-Id: Ib0045af8b0e1e93cb3000b34a63a0a0747fdcdc5
This commit is contained in:
Motohiro OTSUKA 2014-11-25 14:09:05 +09:00
parent ff36501bf1
commit 049578d76c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
magnumclient/api/client.py
View File

@ -22,7 +22,7 @@ from magnumclient.api import httpclient
class Client(object): class Client(object):
def __init__(self, username=None, api_key=None, project_id=None, def __init__(self, username=None, api_key=None, project_id=None,
project_name=None, auth_url=None, magnum_url=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): input_auth_token=None):
if not input_auth_token: if not input_auth_token:

4
magnumclient/shell.py
View File

@ -57,7 +57,7 @@ from magnumclient import version
DEFAULT_API_VERSION = 'api' DEFAULT_API_VERSION = 'api'
DEFAULT_ENDPOINT_TYPE = 'publicURL' DEFAULT_ENDPOINT_TYPE = 'publicURL'
DEFAULT_SERVICE_TYPE = 'data_processing' DEFAULT_SERVICE_TYPE = 'container'
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -279,7 +279,7 @@ class OpenStackMagnumShell(object):
parser.add_argument('--service-type', parser.add_argument('--service-type',
metavar='<service-type>', metavar='<service-type>',
help='Defaults to data_processing for all ' help='Defaults to container for all '
'actions.') 'actions.')
parser.add_argument('--service_type', parser.add_argument('--service_type',
help=argparse.SUPPRESS) help=argparse.SUPPRESS)