diff options
| author | Monty Taylor <mordred@redhat.com> | 2018-05-30 14:11:53 -0500 |
|---|---|---|
| committer | David Shrewsbury <Shrews@users.noreply.github.com> | 2018-05-30 15:11:53 -0400 |
| commit | d0f43bc6f88d8d31976a7b7e84305118f01e9fb6 (patch) | |
| tree | 11aa4092c288ee0372638403fd0ff38323bd404e | |
| parent | 96ec32630ef043fe9e1eda8e690a7796b3da58e2 (diff) | |
| download | ansible-d0f43bc6f88d8d31976a7b7e84305118f01e9fb6.tar.gz | |
Pass cloud parameter to get_one call (#40892)
When we switch this to pull from the CloudRegion object, we missed
passing the parameter along.
| -rwxr-xr-x | contrib/inventory/openstack_inventory.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/inventory/openstack_inventory.py b/contrib/inventory/openstack_inventory.py index cb581ad85d..cf7bed949d 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() |