wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pass cloud parameter to get_one call (#40892)

Browse source 
When we switch this to pull from the CloudRegion object, we missed
passing the parameter along.
This commit is contained in:
Monty Taylor 2018-05-30 14:11:53 -05:00 committed by David Shrewsbury
parent 96ec32630e
commit d0f43bc6f8
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
contrib/inventory/openstack_inventory.py
View file

@ -191,8 +191,9 @@ def is_cache_stale(cache_file, cache_expiration_time, refresh=False):
def get_cache_settings(cloud=None):
config_files = cloud_config.CONFIG_FILES + CONFIG_FILES
config = cloud_config.OpenStackConfig(
config_files=cloud_config.CONFIG_FILES + CONFIG_FILES).get_one()
config_files=config_files).get_one(cloud=cloud)
# For inventory-wide caching
cache_expiration_time = config.get_cache_expiration_time()
cache_path = config.get_cache_path()