From 5194965a24667dffcea74d2c949eb8ed8bfbeb87 Mon Sep 17 00:00:00 2001
From: Matt Clay <matt@mystile.com>
Date: Fri, 5 Jun 2020 14:48:33 -0700
Subject: [PATCH] Revert "Revert "fixes f5 modules specific redirects
 (#69865)""

This reverts commit a69c23fd5be072d5e21c85bbb9d40df1dca5533b.
---
 .../config/ansible_builtin_runtime.yml        | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/lib/ansible/config/ansible_builtin_runtime.yml b/lib/ansible/config/ansible_builtin_runtime.yml
index 95227e15c2e..8a41a89d19b 100644
--- a/lib/ansible/config/ansible_builtin_runtime.yml
+++ b/lib/ansible/config/ansible_builtin_runtime.yml
@@ -2161,23 +2161,27 @@ plugin_routing:
     exos_vlans:
       redirect: community.network.exos_vlans
     bigip_asm_policy:
-      redirect: f5networks.f5_nodules.bigip_asm_policy
+      tombstone:
+        removal_date: 2019-11-06
+        warning_text: bigip_asm_policy has been removed please use bigip_asm_policy_manage instead.
     bigip_device_facts:
-      redirect: f5networks.f5_nodules.bigip_device_facts
-    bigip_facts:
-      redirect: f5networks.f5_nodules.bigip_facts
-    bigip_gtm_facts:
-      redirect: f5networks.f5_nodules.bigip_gtm_facts
+      redirect: f5networks.f5_modules.bigip_device_info
     bigip_iapplx_package:
-      redirect: f5networks.f5_nodules.bigip_iapplx_package
+      redirect: f5networks.f5_modules.bigip_lx_package
     bigip_security_address_list:
-      redirect: f5networks.f5_nodules.bigip_security_address_list
+      redirect: f5networks.f5_modules.bigip_firewall_address_list
     bigip_security_port_list:
-      redirect: f5networks.f5_nodules.bigip_security_port_list
+      redirect: f5networks.f5_modules.bigip_firewall_port_list
     bigip_traffic_group:
-      redirect: f5networks.f5_nodules.bigip_traffic_group
-    bigiq_device_facts:
-      redirect: f5networks.f5_modules.bigiq_device_info
+      redirect: f5networks.f5_modules.bigip_device_traffic_group
+    bigip_facts:
+      tombstone:
+        removal_date: 2019-11-06
+        warning_text: bigip_facts has been removed please use bigip_device_info module.
+    bigip_gtm_facts:
+      tombstone:
+        removal_date: 2019-11-06
+        warning_text: bigip_gtm_facts has been removed please use bigip_device_info module.
     faz_device:
       redirect: community.network.faz_device
     fmgr_device:
@@ -7616,7 +7620,9 @@ plugin_routing:
     exoscale:
       redirect: community.general.exoscale
     f5_utils:
-      redirect: community.network.f5_utils
+      tombstone:
+        removal_date: 2019-11-06
+        warning_text: f5_utils has been removed.
     firewalld:
       redirect: community.general.firewalld
     gcdns: