Remove deprecated cache support from script inventory plugin (#74813)
This commit is contained in:
parent
d27ce4cef3
commit
df5ce3e672
3 changed files with 5 additions and 22 deletions
3
changelogs/fragments/74143-remove-script-cache.yml
Normal file
3
changelogs/fragments/74143-remove-script-cache.yml
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
bugfixes:
|
||||||
|
- script inventory plugin - Remove deprecated caching support
|
||||||
|
(https://github.com/ansible/ansible/issues/74143)
|
|
@ -10,18 +10,6 @@ DOCUMENTATION = '''
|
||||||
version_added: "2.4"
|
version_added: "2.4"
|
||||||
short_description: Executes an inventory script that returns JSON
|
short_description: Executes an inventory script that returns JSON
|
||||||
options:
|
options:
|
||||||
cache:
|
|
||||||
deprecated:
|
|
||||||
why: This option has never been in use. External scripts must implement their own caching.
|
|
||||||
version: "2.12"
|
|
||||||
description:
|
|
||||||
- This option has no effect. The plugin will not cache results because external inventory scripts
|
|
||||||
are responsible for their own caching. This option will be removed in 2.12.
|
|
||||||
ini:
|
|
||||||
- section: inventory_plugin_script
|
|
||||||
key: cache
|
|
||||||
env:
|
|
||||||
- name: ANSIBLE_INVENTORY_PLUGIN_SCRIPT_CACHE
|
|
||||||
always_show_stderr:
|
always_show_stderr:
|
||||||
description: Toggle display of stderr even when script was successful
|
description: Toggle display of stderr even when script was successful
|
||||||
version_added: "2.5.1"
|
version_added: "2.5.1"
|
||||||
|
@ -50,13 +38,13 @@ from ansible.module_utils.basic import json_dict_bytes_to_unicode
|
||||||
from ansible.module_utils.six import iteritems
|
from ansible.module_utils.six import iteritems
|
||||||
from ansible.module_utils._text import to_native, to_text
|
from ansible.module_utils._text import to_native, to_text
|
||||||
from ansible.module_utils.common._collections_compat import Mapping
|
from ansible.module_utils.common._collections_compat import Mapping
|
||||||
from ansible.plugins.inventory import BaseInventoryPlugin, Cacheable
|
from ansible.plugins.inventory import BaseInventoryPlugin
|
||||||
from ansible.utils.display import Display
|
from ansible.utils.display import Display
|
||||||
|
|
||||||
display = Display()
|
display = Display()
|
||||||
|
|
||||||
|
|
||||||
class InventoryModule(BaseInventoryPlugin, Cacheable):
|
class InventoryModule(BaseInventoryPlugin):
|
||||||
''' Host inventory parser for ansible using external inventory scripts. '''
|
''' Host inventory parser for ansible using external inventory scripts. '''
|
||||||
|
|
||||||
NAME = 'script'
|
NAME = 'script'
|
||||||
|
@ -93,13 +81,6 @@ class InventoryModule(BaseInventoryPlugin, Cacheable):
|
||||||
super(InventoryModule, self).parse(inventory, loader, path)
|
super(InventoryModule, self).parse(inventory, loader, path)
|
||||||
self.set_options()
|
self.set_options()
|
||||||
|
|
||||||
if self.get_option('cache') is not None:
|
|
||||||
display.deprecated(
|
|
||||||
msg="The 'cache' option is deprecated for the script inventory plugin. "
|
|
||||||
"External scripts implement their own caching and this option has never been used",
|
|
||||||
version="2.12", collection_name='ansible.builtin'
|
|
||||||
)
|
|
||||||
|
|
||||||
# Support inventory scripts that are not prefixed with some
|
# Support inventory scripts that are not prefixed with some
|
||||||
# path information but happen to be in the current working
|
# path information but happen to be in the current working
|
||||||
# directory when '.' is not in PATH.
|
# directory when '.' is not in PATH.
|
||||||
|
|
|
@ -119,7 +119,6 @@ lib/ansible/plugins/action/__init__.py pylint:ansible-deprecated-version
|
||||||
lib/ansible/plugins/action/async_status.py pylint:ansible-deprecated-version
|
lib/ansible/plugins/action/async_status.py pylint:ansible-deprecated-version
|
||||||
lib/ansible/plugins/action/normal.py action-plugin-docs # default action plugin for modules without a dedicated action plugin
|
lib/ansible/plugins/action/normal.py action-plugin-docs # default action plugin for modules without a dedicated action plugin
|
||||||
lib/ansible/plugins/cache/base.py ansible-doc!skip # not a plugin, but a stub for backwards compatibility
|
lib/ansible/plugins/cache/base.py ansible-doc!skip # not a plugin, but a stub for backwards compatibility
|
||||||
lib/ansible/plugins/inventory/script.py pylint:ansible-deprecated-version
|
|
||||||
lib/ansible/plugins/lookup/sequence.py pylint:blacklisted-name
|
lib/ansible/plugins/lookup/sequence.py pylint:blacklisted-name
|
||||||
lib/ansible/plugins/strategy/__init__.py pylint:blacklisted-name
|
lib/ansible/plugins/strategy/__init__.py pylint:blacklisted-name
|
||||||
lib/ansible/plugins/strategy/linear.py pylint:blacklisted-name
|
lib/ansible/plugins/strategy/linear.py pylint:blacklisted-name
|
||||||
|
|
Loading…
Reference in a new issue