mirror of
https://github.com/ansible/awx.git
synced 2026-05-19 23:07:42 -02:30
Merge pull request #2466 from jlaska/cloud_verify_ssl
Honor CLOUD_VERIFY_SSL variable in rax import
This commit is contained in:
@@ -385,6 +385,10 @@ def parse_args():
|
|||||||
def setup():
|
def setup():
|
||||||
default_creds_file = os.path.expanduser('~/.rackspace_cloud_credentials')
|
default_creds_file = os.path.expanduser('~/.rackspace_cloud_credentials')
|
||||||
|
|
||||||
|
# pyrax does not honor the environment variable CLOUD_VERIFY_SSL=False, so let's help pyrax
|
||||||
|
if 'CLOUD_VERIFY_SSL' in os.environ:
|
||||||
|
pyrax.set_setting('verify_ssl', os.environ['CLOUD_VERIFY_SSL'])
|
||||||
|
|
||||||
env = get_config(p, 'rax', 'environment', 'RAX_ENV', None)
|
env = get_config(p, 'rax', 'environment', 'RAX_ENV', None)
|
||||||
if env:
|
if env:
|
||||||
pyrax.set_environment(env)
|
pyrax.set_environment(env)
|
||||||
|
|||||||
Reference in New Issue
Block a user