From d7735d5eb75e5d7120c67b5f52395fabfede7d6d Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Wed, 3 Jun 2020 10:23:32 -0700
Subject: [PATCH] Lets try not dropping ansible_python from cache

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
---
 cache_plugins/fedora_jsonfile.py | 71 --------------------------------
 tasks/virt_instance_create.yml   |  2 -
 2 files changed, 73 deletions(-)
 delete mode 100644 cache_plugins/fedora_jsonfile.py

diff --git a/cache_plugins/fedora_jsonfile.py b/cache_plugins/fedora_jsonfile.py
deleted file mode 100644
index 12b3032579..0000000000
--- a/cache_plugins/fedora_jsonfile.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# (c) 2014, Brian Coca, Josh Drake, et al
-# (c) 2017 Ansible Project
-# (c) 2019 Red Hat, Inc. via Fedora
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-# This is a hack to stop caching discovered_interpreter_python
-
-# Make coding more python3-ish
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-NEVER_CACHE_KEYS = ['discovered_interpreter_python']
-
-DOCUMENTATION = '''
-    cache: fedora_jsonfile
-    short_description: JSON formatted files.
-    description:
-        - This cache uses JSON formatted, per host, files saved to the filesystem.
-    version_added: "1.9"
-    author: Ansible Core (@ansible-core)
-    options:
-      _uri:
-        required: True
-        description:
-          - Path in which the cache plugin will save the JSON files
-        env:
-          - name: ANSIBLE_CACHE_PLUGIN_CONNECTION
-        ini:
-          - key: fact_caching_connection
-            section: defaults
-      _prefix:
-        description: User defined prefix to use when creating the JSON files
-        env:
-          - name: ANSIBLE_CACHE_PLUGIN_PREFIX
-        ini:
-          - key: fact_caching_prefix
-            section: defaults
-      _timeout:
-        default: 86400
-        description: Expiration timeout for the cache plugin data
-        env:
-          - name: ANSIBLE_CACHE_PLUGIN_TIMEOUT
-        ini:
-          - key: fact_caching_timeout
-            section: defaults
-        type: integer
-'''
-
-import codecs
-import json
-
-from ansible.parsing.ajson import AnsibleJSONEncoder, AnsibleJSONDecoder
-from ansible.plugins.cache import BaseFileCacheModule
-
-
-class CacheModule(BaseFileCacheModule):
-    """
-    A caching module backed by json files.
-    """
-
-    def _load(self, filepath):
-        # Valid JSON is always UTF-8 encoded.
-        with codecs.open(filepath, 'r', encoding='utf-8') as f:
-            return json.load(f, cls=AnsibleJSONDecoder)
-
-    def _dump(self, value, filepath):
-        for k in NEVER_CACHE_KEYS:
-            if k in value:
-                del value[k]
-        with codecs.open(filepath, 'w', encoding='utf-8') as f:
-            f.write(json.dumps(value, cls=AnsibleJSONEncoder, sort_keys=True, indent=4))
diff --git a/tasks/virt_instance_create.yml b/tasks/virt_instance_create.yml
index 6e007f1d73..ae69cf2521 100644
--- a/tasks/virt_instance_create.yml
+++ b/tasks/virt_instance_create.yml
@@ -4,8 +4,6 @@
 - include_vars: dir=/srv/web/infra/ansible/vars/all/ ignore_files=README
 
 - name: get vm list
-  vars:
-    ansible_python_interpreter: "{{ hostvars[vmhost]['ansible_python']['executable'] }}"
   delegate_to: "{{ vmhost }}"
   virt: command=list_vms
   register: result