summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Coca <brian.coca+git@gmail.com>2018-09-17 18:47:42 -0400
committerMatt Clay <matt@mystile.com>2019-01-09 17:03:47 -0800
commitbcdd9abcd3a4649e8e944d660c3473a78231f568 (patch)
tree18d829718f6c15976d7a38da80c3946eec0f3fd2
parentc2f61164769e6d4969571bee6d21c04ada9451a1 (diff)
downloadansible-bcdd9abcd3a4649e8e944d660c3473a78231f568.tar.gz
allow openstack invetnory to work cacheless
fixes #45431 (cherry picked from commit a47671aad12f3527902424a81075ca31a43fef6a)
-rw-r--r--changelogs/fragments/openstack_inventory_fix.yml2
-rw-r--r--lib/ansible/plugins/inventory/openstack.py3
2 files changed, 4 insertions, 1 deletions
diff --git a/changelogs/fragments/openstack_inventory_fix.yml b/changelogs/fragments/openstack_inventory_fix.yml
new file mode 100644
index 0000000000..890e6277d2
--- /dev/null
+++ b/changelogs/fragments/openstack_inventory_fix.yml
@@ -0,0 +1,2 @@
+bugfixes:
+ - allow using openstack inventory plugin w/o a cache
diff --git a/lib/ansible/plugins/inventory/openstack.py b/lib/ansible/plugins/inventory/openstack.py
index bd1e303e8c..8774df978f 100644
--- a/lib/ansible/plugins/inventory/openstack.py
+++ b/lib/ansible/plugins/inventory/openstack.py
@@ -190,7 +190,8 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
source_data = cloud_inventory.list_hosts(
expand=expand_hostvars, fail_on_cloud_config=fail_on_errors)
- self.cache.set(cache_key, source_data)
+ if self.cache is not None:
+ self.cache.set(cache_key, source_data)
self._populate_from_source(source_data)