diff --git a/playbooks/library/os_ironic_facts.py b/playbooks/library/os_ironic_facts.py deleted file mode 120000 index 8b0db8cfd..000000000 --- a/playbooks/library/os_ironic_facts.py +++ /dev/null @@ -1 +0,0 @@ -os_ironic_node_info.py \ No newline at end of file diff --git a/playbooks/library/os_ironic_node_info.py b/playbooks/library/os_ironic_node_info.py index 19add3927..47b1e96cb 100644 --- a/playbooks/library/os_ironic_node_info.py +++ b/playbooks/library/os_ironic_node_info.py @@ -90,10 +90,6 @@ def main(): ) module_kwargs = openstack_module_kwargs() # noqa: F405 module = IronicModule(argument_spec, **module_kwargs) - compat = module._name == 'os_ironic_facts' - if compat: - module.deprecate('Using os_ironic_node_info via os_ironic_facts is ' - 'deprecated and may not work correctly') if not HAS_SDK: module.fail_json(msg='openstacksdk is required for this module') @@ -134,15 +130,7 @@ def main(): nics = cloud.list_nics_for_machine(server['uuid']) facts['nics'] = [{'mac': nic['address']} for nic in nics] - if compat: - # NOTE(dtantsur): this item conflicts with the ansible's own - # network_interface breaking everything. - facts.pop('network_interface', None) - - if compat: - module.exit_json(changed=False, ansible_facts=facts) - else: - module.exit_json(changed=False, node=facts) + module.exit_json(changed=False, node=facts) else: module.fail_json(msg="node not found.") diff --git a/releasenotes/notes/facts-1a84f77291c7d39d.yaml b/releasenotes/notes/facts-1a84f77291c7d39d.yaml new file mode 100644 index 000000000..d58c032aa --- /dev/null +++ b/releasenotes/notes/facts-1a84f77291c7d39d.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + Removes the deprecated Ansible module ``os_ironic_facts``.