External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-06 19:21:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

AC-558 When importing from Rackspace, add environment variable to make vendored package happy.

Browse Source
This commit is contained in:
Chris Church
2013-10-16 12:42:46 -04:00
parent 508532f57b
commit 2f3409db08
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/main/tasks.py
View File

@@ -772,6 +772,9 @@ class RunInventoryUpdate(BaseTask):
elif inventory_source.source == 'rackspace': elif inventory_source.source == 'rackspace':
env['RAX_CREDS_FILE'] = kwargs.get('private_data_file', '') env['RAX_CREDS_FILE'] = kwargs.get('private_data_file', '')
env['RAX_REGION'] = inventory_source.source_regions env['RAX_REGION'] = inventory_source.source_regions
# Set this environment variable so the vendored package won't
# complain about not being able to determine its version number.
env['PBR_VERSION'] = '0.5.21'
elif inventory_source.source == 'file': elif inventory_source.source == 'file':
# FIXME: Parse source_env to dict, update env. # FIXME: Parse source_env to dict, update env.
pass pass