cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Move regions until after authentication; otherwise pyrax.regions is an empty tuple and no inventory is returned.

Browse source
This commit is contained in:
Paul Durivage 2013-10-19 14:57:23 -05:00
parent 3bfdaad060
commit f63a6fafe9
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
plugins/inventory/rax.py
View file

@ -86,6 +86,7 @@ examples:
import sys
import re
import os
import argparse
import collections
@ -192,6 +193,14 @@ def setup():
% (e.message, default_creds_file))
sys.exit(1)
pyrax.set_setting('identity_type', 'rackspace')
try:
pyrax.set_credential_file(os.path.expanduser(creds_file))
except Exception, e:
sys.stderr.write("%s: %s\n" % (e, e.message))
sys.exit(1)
regions = []
for region in os.getenv('RAX_REGION', 'all').split(','):
region = region.strip().upper()
@ -204,14 +213,6 @@ def setup():
elif region not in regions:
regions.append(region)
pyrax.set_setting('identity_type', 'rackspace')
try:
pyrax.set_credential_file(os.path.expanduser(creds_file))
except Exception, e:
sys.stderr.write("%s: %s\n" % (e, e.message))
sys.exit(1)
return regions