Fix all action plugins to import safely
This addresses the known issue with plugin inheritance in all action
plugins.
Change-Id: I8436d52ced0c96904375dc98da7c32ff2e47cb5e
diff --git a/zuul/ansible/action/add_host.py b/zuul/ansible/action/add_host.py
index 83cfa39..d4b24aa 100644
--- a/zuul/ansible/action/add_host.py
+++ b/zuul/ansible/action/add_host.py
@@ -13,7 +13,8 @@
# You should have received a copy of the GNU General Public License
# along with this software. If not, see <http://www.gnu.org/licenses/>.
-from ansible.plugins.action import add_host
+from zuul.ansible import paths
+add_host = paths._import_ansible_action_plugin("add_host")
class ActionModule(add_host.ActionModule):
diff --git a/zuul/ansible/action/assemble.py b/zuul/ansible/action/assemble.py
index 2280191..2cc7eb7 100644
--- a/zuul/ansible/action/assemble.py
+++ b/zuul/ansible/action/assemble.py
@@ -15,7 +15,7 @@
from zuul.ansible import paths
-from ansible.plugins.action import assemble
+assemble = paths._import_ansible_action_plugin("assemble")
class ActionModule(assemble.ActionModule):
diff --git a/zuul/ansible/action/copy.py b/zuul/ansible/action/copy.py
index c90ebc7..bb54430 100644
--- a/zuul/ansible/action/copy.py
+++ b/zuul/ansible/action/copy.py
@@ -15,7 +15,7 @@
from zuul.ansible import paths
-from ansible.plugins.action import copy
+copy = paths._import_ansible_action_plugin("copy")
class ActionModule(copy.ActionModule):
diff --git a/zuul/ansible/action/fetch.py b/zuul/ansible/action/fetch.py
index 2fc3ce5..170b655 100644
--- a/zuul/ansible/action/fetch.py
+++ b/zuul/ansible/action/fetch.py
@@ -15,7 +15,7 @@
from zuul.ansible import paths
-from ansible.plugins.action import fetch
+fetch = paths._import_ansible_action_plugin("fetch")
class ActionModule(fetch.ActionModule):
diff --git a/zuul/ansible/action/include_vars.py b/zuul/ansible/action/include_vars.py
index 2706a1f..5bc1d76 100644
--- a/zuul/ansible/action/include_vars.py
+++ b/zuul/ansible/action/include_vars.py
@@ -15,7 +15,7 @@
from zuul.ansible import paths
-from ansible.plugins.action import include_vars
+include_vars = paths._import_ansible_action_plugin("include_vars")
class ActionModule(include_vars.ActionModule):
diff --git a/zuul/ansible/action/network.py b/zuul/ansible/action/network.py
index 18de5a5..41fc560 100644
--- a/zuul/ansible/action/network.py
+++ b/zuul/ansible/action/network.py
@@ -14,7 +14,8 @@
# along with this software. If not, see <http://www.gnu.org/licenses/>.
-from ansible.plugins.action import network
+from zuul.ansible import paths
+network = paths._import_ansible_action_plugin("network")
class ActionModule(network.ActionModule):
diff --git a/zuul/ansible/action/patch.py b/zuul/ansible/action/patch.py
index a83a9e1..0b43c82 100644
--- a/zuul/ansible/action/patch.py
+++ b/zuul/ansible/action/patch.py
@@ -15,7 +15,7 @@
from zuul.ansible import paths
-from ansible.plugins.action import patch
+patch = paths._import_ansible_action_plugin("patch")
class ActionModule(patch.ActionModule):
diff --git a/zuul/ansible/action/script.py b/zuul/ansible/action/script.py
index ee5b186..c95d357 100644
--- a/zuul/ansible/action/script.py
+++ b/zuul/ansible/action/script.py
@@ -15,10 +15,10 @@
from zuul.ansible import paths
-from ansible.plugins.action import copy
+script = paths._import_ansible_action_plugin("script")
-class ActionModule(copy.ActionModule):
+class ActionModule(script.ActionModule):
def run(self, tmp=None, task_vars=None):
diff --git a/zuul/ansible/action/synchronize.py b/zuul/ansible/action/synchronize.py
index 8799eb9..0193eca 100644
--- a/zuul/ansible/action/synchronize.py
+++ b/zuul/ansible/action/synchronize.py
@@ -15,7 +15,7 @@
from zuul.ansible import paths
-from ansible.plugins.action import synchronize
+synchronize = paths._import_ansible_action_plugin("synchronize")
class ActionModule(synchronize.ActionModule):
diff --git a/zuul/ansible/action/template.py b/zuul/ansible/action/template.py
index cd3b10e..c6df3d8 100644
--- a/zuul/ansible/action/template.py
+++ b/zuul/ansible/action/template.py
@@ -15,7 +15,7 @@
from zuul.ansible import paths
-from ansible.plugins.action import template
+template = paths._import_ansible_action_plugin("template")
class ActionModule(template.ActionModule):
diff --git a/zuul/ansible/action/unarchive.py b/zuul/ansible/action/unarchive.py
index d6b2190..c78c331 100644
--- a/zuul/ansible/action/unarchive.py
+++ b/zuul/ansible/action/unarchive.py
@@ -15,7 +15,7 @@
from zuul.ansible import paths
-from ansible.plugins.action import unarchive
+unarchive = paths._import_ansible_action_plugin("unarchive")
class ActionModule(unarchive.ActionModule):
diff --git a/zuul/ansible/action/win_copy.py b/zuul/ansible/action/win_copy.py
index c051630..2751585 100644
--- a/zuul/ansible/action/win_copy.py
+++ b/zuul/ansible/action/win_copy.py
@@ -15,7 +15,7 @@
from zuul.ansible import paths
-from ansible.plugins.action import win_copy
+win_copy = paths._import_ansible_action_plugin("win_copy")
class ActionModule(win_copy.ActionModule):
diff --git a/zuul/ansible/action/win_template.py b/zuul/ansible/action/win_template.py
index de88eb8..7a357f9 100644
--- a/zuul/ansible/action/win_template.py
+++ b/zuul/ansible/action/win_template.py
@@ -15,7 +15,7 @@
from zuul.ansible import paths
-from ansible.plugins.action import win_template
+win_template = paths._import_ansible_action_plugin("win_template")
class ActionModule(win_template.ActionModule):