From 90d262093921d8d16f035419b7f0cc395ab6e058 Mon Sep 17 00:00:00 2001
From: Matt Martz <matt@sivel.net>
Date: Thu, 18 Oct 2018 01:44:44 -0500
Subject: [PATCH] Remove deprecated os_server_actions alias (#47208)

* Remove deprecated os_server_actions alias. Fixes #44991

* Skip os_server_actions
---
 .../cloud/openstack/_os_server_actions.py     | 20 ++++++++++++++++++-
 .../cloud/openstack/os_server_action.py       |  3 ---
 test/sanity/ansible-doc/skip.txt              |  1 +
 3 files changed, 20 insertions(+), 4 deletions(-)
 mode change 120000 => 100644 lib/ansible/modules/cloud/openstack/_os_server_actions.py

diff --git a/lib/ansible/modules/cloud/openstack/_os_server_actions.py b/lib/ansible/modules/cloud/openstack/_os_server_actions.py
deleted file mode 120000
index fbfc7fba62a..00000000000
--- a/lib/ansible/modules/cloud/openstack/_os_server_actions.py
+++ /dev/null
@@ -1 +0,0 @@
-os_server_action.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/openstack/_os_server_actions.py b/lib/ansible/modules/cloud/openstack/_os_server_actions.py
new file mode 100644
index 00000000000..3668554e9c7
--- /dev/null
+++ b/lib/ansible/modules/cloud/openstack/_os_server_actions.py
@@ -0,0 +1,19 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+# Copyright: (c) 2018, Ansible Project
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
+ANSIBLE_METADATA = {'metadata_version': '1.1',
+                    'status': ['removed'],
+                    'supported_by': 'community'}
+
+
+from ansible.module_utils.common.removed import removed_module
+
+
+if __name__ == '__main__':
+    removed_module(removed_in='2.8')
diff --git a/lib/ansible/modules/cloud/openstack/os_server_action.py b/lib/ansible/modules/cloud/openstack/os_server_action.py
index fc1a4147630..25004bd851e 100644
--- a/lib/ansible/modules/cloud/openstack/os_server_action.py
+++ b/lib/ansible/modules/cloud/openstack/os_server_action.py
@@ -130,9 +130,6 @@ def main():
                            required_if=[('action', 'rebuild', ['image'])],
                            **module_kwargs)
 
-    if module._name == 'os_server_actions':
-        module.deprecate("The 'os_server_actions' module is being renamed 'os_server_action'", version=2.8)
-
     action = module.params['action']
     wait = module.params['wait']
     timeout = module.params['timeout']
diff --git a/test/sanity/ansible-doc/skip.txt b/test/sanity/ansible-doc/skip.txt
index 1074959e085..1c1e7e7fb5f 100644
--- a/test/sanity/ansible-doc/skip.txt
+++ b/test/sanity/ansible-doc/skip.txt
@@ -18,3 +18,4 @@ cs_nic
 ec2_remote_facts
 netscaler
 win_msi
+os_server_actions