diff --git a/changelogs/fragments/defer_removal_of_inventory_plugin.yaml b/changelogs/fragments/defer_removal_of_inventory_plugin.yaml new file mode 100644 index 0000000..769c23e --- /dev/null +++ b/changelogs/fragments/defer_removal_of_inventory_plugin.yaml @@ -0,0 +1,2 @@ +minor_changes: + - inventory/openshift.py - Defer removal of k8s inventory plugin to version 5.0.0 (https://github.com/openshift/community.okd/pull/224). diff --git a/meta/runtime.yml b/meta/runtime.yml index 533a030..8c7dcba 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -20,10 +20,10 @@ plugin_routing: inventory: openshift: deprecation: - removal_version: 4.0.0 + removal_version: 5.0.0 warning_text: >- The openshift inventory plugin has been deprecated and - will be removed in release 4.0.0. + will be removed in release 5.0.0. action: k8s: redirect: kubernetes.core.k8s_info diff --git a/plugins/inventory/openshift.py b/plugins/inventory/openshift.py index 4ec7884..c9b1f4e 100644 --- a/plugins/inventory/openshift.py +++ b/plugins/inventory/openshift.py @@ -18,10 +18,10 @@ DOCUMENTATION = """ - Uses openshift.(yml|yaml) YAML configuration file to set parameter values. deprecated: - removed_in: 4.0.0 + removed_in: 5.0.0 why: | As discussed in U(https://github.com/ansible-collections/kubernetes.core/issues/31), we decided to - remove the openshift inventory plugin in release 4.0.0. + remove the openshift inventory plugin in release 5.0.0. alternative: "Use M(kubernetes.core.k8s_info) and M(ansible.builtin.add_host) instead." options: @@ -157,8 +157,8 @@ class InventoryModule(K8sInventoryModule): super(InventoryModule, self).fetch_objects(connections) self.display.deprecated( - "The 'openshift' inventory plugin has been deprecated and will be removed in release 4.0.0", - version="4.0.0", + "The 'openshift' inventory plugin has been deprecated and will be removed in release 5.0.0", + version="5.0.0", collection_name="community.okd", )