From 475c0d87c2ffb0fda1769f6fe604adcf5f2c7378 Mon Sep 17 00:00:00 2001 From: Chris Church Date: Wed, 6 Nov 2013 22:47:52 -0500 Subject: [PATCH] AC-615 Handle Rackspace inventory import when source_regions is empty string. --- awx/main/tasks.py | 2 +- awx/main/tests/inventory.py | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/awx/main/tasks.py b/awx/main/tasks.py index 85490ea911..81ffeca2fc 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -782,7 +782,7 @@ class RunInventoryUpdate(BaseTask): env['EC2_INI_PATH'] = kwargs.get('private_data_file', '') elif inventory_source.source == 'rackspace': env['RAX_CREDS_FILE'] = kwargs.get('private_data_file', '') - env['RAX_REGION'] = inventory_source.source_regions + env['RAX_REGION'] = inventory_source.source_regions or 'all' # 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' diff --git a/awx/main/tests/inventory.py b/awx/main/tests/inventory.py index 54077de37e..f93943ae1b 100644 --- a/awx/main/tests/inventory.py +++ b/awx/main/tests/inventory.py @@ -967,6 +967,8 @@ class InventoryUpdatesTest(BaseTransactionTest): self.organization.users.add(self.normal_django_user) self.inventory = self.organization.inventories.create(name='Cloud Inventory') self.group = self.inventory.groups.create(name='Cloud Group') + self.inventory2 = self.organization.inventories.create(name='Cloud Inventory 2') + self.group2 = self.inventory2.groups.create(name='Cloud Group 2') def update_inventory_source(self, group, **kwargs): inventory_source = group.inventory_source @@ -1055,3 +1057,8 @@ class InventoryUpdatesTest(BaseTransactionTest): source='rackspace', credential=credential, source_regions=source_regions) self.check_inventory_source(inventory_source) + # If test source regions is given, test again with empty string. + if source_regions: + inventory_source2 = self.update_inventory_source(self.group2, + source='rackspace', credential=credential, source_regions='') + self.check_inventory_source(inventory_source2)