External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-09 18:37:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

AC-613 Change rackspace to rax for inventory source field value.

Browse Source
This commit is contained in:
Chris Church
2013-11-16 16:47:32 -05:00
parent 29a7e2c75d
commit 902c7c2d72
5 changed files with 412 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/tasks.py
View File

@@ -739,7 +739,7 @@ class RunInventoryUpdate(BaseTask):
for k,v in ec2_opts.items():
cp.set(section, k, str(v))
# Build pyrax creds INI for rax inventory script.
elif inventory_source.source == 'rackspace':
elif inventory_source.source == 'rax':
section = 'rackspace_cloud'
cp.add_section(section)
credential = inventory_source.credential
@@ -785,7 +785,7 @@ class RunInventoryUpdate(BaseTask):
env['AWS_ACCESS_KEY_ID'] = kwargs.get('passwords', {}).get('source_username', '')
env['AWS_SECRET_ACCESS_KEY'] = kwargs.get('passwords', {}).get('source_password', '')
env['EC2_INI_PATH'] = kwargs.get('private_data_file', '')
elif inventory_source.source == 'rackspace':
elif inventory_source.source == 'rax':
env['RAX_CREDS_FILE'] = kwargs.get('private_data_file', '')
env['RAX_REGION'] = inventory_source.source_regions or 'all'
# Set this environment variable so the vendored package won't
@@ -816,7 +816,7 @@ class RunInventoryUpdate(BaseTask):
args.extend(['--enabled-var', 'ec2_state'])
args.extend(['--enabled-value', 'running'])
#args.extend(['--instance-id', 'ec2_id'])
elif inventory_source.source == 'rackspace':
elif inventory_source.source in == 'rax':
rax_path = self.get_path_to('..', 'plugins', 'inventory', 'rax.py')
args.append(rax_path)
args.extend(['--enabled-var', 'rax_status'])