diff options
| author | Steve Martinelli <stevemar@ca.ibm.com> | 2013-04-18 17:49:42 -0500 |
|---|---|---|
| committer | Dean Troyer <dtroyer@gmail.com> | 2013-07-03 11:51:23 -0500 |
| commit | f29a849ffcc203e7038fd2a026e0f755dcf2c1fc (patch) | |
| tree | 75ff2e2a5d529d7b81236bbf1100393a0e173f5a /openstackclient/shell.py | |
| parent | d50b5750640ace3a77e6e0637d6cd24f91db8080 (diff) | |
| download | python-openstackclient-f29a849ffcc203e7038fd2a026e0f755dcf2c1fc.tar.gz | |
Finish up v3 role commands
* Add remove role
* Add --role to group list
* Add --role to user list
* Fix groups in AddRole()
* Remove the tweaks to utils.find_resource for domains; will address
that across domains, projects, users and groups in another patch.
I want to nail down the structure of these commands and get that into place
Change-Id: I8673dd8221ef88978dada5a2833c187026bdb31a
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, |