diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-07-05 17:10:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-07-05 17:10:22 +0000 |
| commit | bf3ee1e9a5e7af4975571b2040659071ec08dcd7 (patch) | |
| tree | 0fc2f99b76a10ca9437323206bf110eb5213490f /openstackclient/shell.py | |
| parent | a54b88fa9fd6b6b857ed5f62d91b61677a34429c (diff) | |
| parent | f29a849ffcc203e7038fd2a026e0f755dcf2c1fc (diff) | |
| download | python-openstackclient-bf3ee1e9a5e7af4975571b2040659071ec08dcd7.tar.gz | |
Merge "Finish up v3 role commands"
Diffstat (limited to 'openstackclient/shell.py')
| -rw-r--r-- | openstackclient/shell.py | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/openstackclient/shell.py b/openstackclient/shell.py index 35d8255d..e5353194 100644 --- a/openstackclient/shell.py +++ b/openstackclient/shell.py @@ -37,6 +37,7 @@ DEFAULT_COMPUTE_API_VERSION = '2' DEFAULT_IDENTITY_API_VERSION = '2.0' DEFAULT_IMAGE_API_VERSION = '2' DEFAULT_VOLUME_API_VERSION = '1' +DEFAULT_DOMAIN = 'default' def env(*vars, **kwargs): @@ -135,6 +136,15 @@ class OpenStackShell(app.App): default=env('OS_REGION_NAME'), help='Authentication region name (Env: OS_REGION_NAME)') parser.add_argument( + '--os-default-domain', + metavar='<auth-domain>', + default=env( + 'OS_DEFAULT_DOMAIN', + default=DEFAULT_DOMAIN), + help='Default domain ID, default=' + + DEFAULT_DOMAIN + + ' (Env: OS_DEFAULT_DOMAIN)') + parser.add_argument( '--os-identity-api-version', metavar='<identity-api-version>', default=env( @@ -304,7 +314,10 @@ class OpenStackShell(app.App): else: requests_log.setLevel(logging.WARNING) - # stash selected API versions for later + # Save default domain + self.default_domain = self.options.os_default_domain + + # Stash selected API versions for later self.api_version = { 'compute': self.options.os_compute_api_version, 'identity': self.options.os_identity_api_version, |