wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Error if shade is too old for domain_id on os_project (#2806)

Browse source 
* Error if shade is too old for domain_id on os_project

os_project's domain_id parameter requires shade >= 1.8.1 to work. Be
explicit.

Fixes #2805 os_project requires python-shade 1.8.1 or higher

* What I really meant was 1.8.0
This commit is contained in:
Monty Taylor 2016-08-31 14:41:12 -05:00 committed by Matt Clay
parent 91abacfca7
commit 510e1140ce
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/modules/extras/cloud/openstack/os_project.py
View file

@ -21,6 +21,8 @@ try:
except ImportError: except ImportError:
HAS_SHADE = False HAS_SHADE = False
from distutils.version import StrictVersion
DOCUMENTATION = ''' DOCUMENTATION = '''
--- ---
module: os_project module: os_project
@ -46,7 +48,8 @@ options:
default: None default: None
domain_id: domain_id:
description: description:
- Domain id to create the project in if the cloud supports domains - Domain id to create the project in if the cloud supports domains.
The domain_id parameter requires shade >= 1.8.0
required: false required: false
default: None default: None
aliases: ['domain'] aliases: ['domain']
@ -160,6 +163,9 @@ def main():
enabled = module.params['enabled'] enabled = module.params['enabled']
state = module.params['state'] state = module.params['state']
if domain and StrictVersion(shade.__version__) < StrictVersion('1.8.0'):
module.fail_json(msg="The domain argument requires shade >=1.8.0")
try: try:
if domain: if domain:
opcloud = shade.operator_cloud(**module.params) opcloud = shade.operator_cloud(**module.params)