From 741e09f984f7861bb8fa6bb2cde179fc11e44cb9 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Wed, 30 May 2018 10:16:23 -0500 Subject: [PATCH] Pass cloud parameter to get_one call When we switch this to pull from the CloudRegion object, we missed passing the parameter along. --- contrib/inventory/openstack_inventory.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/inventory/openstack_inventory.py b/contrib/inventory/openstack_inventory.py index cb581ad85df..cf7bed949dc 100755 --- a/contrib/inventory/openstack_inventory.py +++ b/contrib/inventory/openstack_inventory.py @@ -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()