From 3317a37eeee6792bf1051a6ba8bc7e5bfab87420 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Tue, 21 Feb 2017 13:12:30 -0500 Subject: [PATCH] Import the ansible base module, not self We want to override the base action plugins. We can't do that if we try to import non-existent locations in the zuul tree. Change-Id: I6242d973d4ce3b42bcec2812ba261ac6f968fcf4 --- zuul/ansible/action/add_host.py | 2 +- zuul/ansible/action/assemble.py | 2 +- zuul/ansible/action/copy.py | 2 +- zuul/ansible/action/fetch.py | 2 +- zuul/ansible/action/include_vars.py | 2 +- zuul/ansible/action/network.py | 2 +- zuul/ansible/action/normal.py | 2 +- zuul/ansible/action/patch.py | 2 +- zuul/ansible/action/script.py | 2 +- zuul/ansible/action/synchronize.py | 2 +- zuul/ansible/action/template.py | 2 +- zuul/ansible/action/unarchive.py | 2 +- zuul/ansible/action/win_copy.py | 2 +- zuul/ansible/action/win_template.py | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/zuul/ansible/action/add_host.py b/zuul/ansible/action/add_host.py index e41e4e1058..83cfa39b93 100644 --- a/zuul/ansible/action/add_host.py +++ b/zuul/ansible/action/add_host.py @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this software. If not, see . -from zuul.ansible.plugins.action import add_host +from ansible.plugins.action import add_host class ActionModule(add_host.ActionModule): diff --git a/zuul/ansible/action/assemble.py b/zuul/ansible/action/assemble.py index d0bff37e4b..2280191513 100644 --- a/zuul/ansible/action/assemble.py +++ b/zuul/ansible/action/assemble.py @@ -15,7 +15,7 @@ from zuul.ansible import paths -from zuul.ansible.plugins.action import assemble +from ansible.plugins.action import assemble class ActionModule(assemble.ActionModule): diff --git a/zuul/ansible/action/copy.py b/zuul/ansible/action/copy.py index 5dc9fa81ba..c90ebc7ac1 100644 --- a/zuul/ansible/action/copy.py +++ b/zuul/ansible/action/copy.py @@ -15,7 +15,7 @@ from zuul.ansible import paths -from zuul.ansible.plugins.action import copy +from ansible.plugins.action import copy class ActionModule(copy.ActionModule): diff --git a/zuul/ansible/action/fetch.py b/zuul/ansible/action/fetch.py index fe06c3b0bb..2fc3ce5a16 100644 --- a/zuul/ansible/action/fetch.py +++ b/zuul/ansible/action/fetch.py @@ -15,7 +15,7 @@ from zuul.ansible import paths -from zuul.ansible.plugins.action import fetch +from ansible.plugins.action import fetch class ActionModule(fetch.ActionModule): diff --git a/zuul/ansible/action/include_vars.py b/zuul/ansible/action/include_vars.py index aa0e7d859f..2706a1f5c2 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 zuul.ansible.plugins.action import include_vars +from ansible.plugins.action import include_vars class ActionModule(include_vars.ActionModule): diff --git a/zuul/ansible/action/network.py b/zuul/ansible/action/network.py index 31a8739386..18de5a58b2 100644 --- a/zuul/ansible/action/network.py +++ b/zuul/ansible/action/network.py @@ -14,7 +14,7 @@ # along with this software. If not, see . -from zuul.ansible.plugins.action import network +from ansible.plugins.action import network class ActionModule(network.ActionModule): diff --git a/zuul/ansible/action/normal.py b/zuul/ansible/action/normal.py index d4b239610c..25ae303e1c 100644 --- a/zuul/ansible/action/normal.py +++ b/zuul/ansible/action/normal.py @@ -14,7 +14,7 @@ # along with this software. If not, see . -from zuul.ansible.plugins.action import normal +from ansible.plugins.action import normal class ActionModule(normal.ActionModule): diff --git a/zuul/ansible/action/patch.py b/zuul/ansible/action/patch.py index d6308444a0..a83a9e1fa1 100644 --- a/zuul/ansible/action/patch.py +++ b/zuul/ansible/action/patch.py @@ -15,7 +15,7 @@ from zuul.ansible import paths -from zuul.ansible.plugins.action import patch +from ansible.plugins.action import patch class ActionModule(patch.ActionModule): diff --git a/zuul/ansible/action/script.py b/zuul/ansible/action/script.py index bd3d5d58f5..ee5b18670c 100644 --- a/zuul/ansible/action/script.py +++ b/zuul/ansible/action/script.py @@ -15,7 +15,7 @@ from zuul.ansible import paths -from zuul.ansible.plugins.action import copy +from ansible.plugins.action import copy class ActionModule(copy.ActionModule): diff --git a/zuul/ansible/action/synchronize.py b/zuul/ansible/action/synchronize.py index cbb7ea2c0c..8799eb9373 100644 --- a/zuul/ansible/action/synchronize.py +++ b/zuul/ansible/action/synchronize.py @@ -15,7 +15,7 @@ from zuul.ansible import paths -from zuul.ansible.plugins.action import synchronize +from ansible.plugins.action import synchronize class ActionModule(synchronize.ActionModule): diff --git a/zuul/ansible/action/template.py b/zuul/ansible/action/template.py index 96471aec2c..cd3b10e982 100644 --- a/zuul/ansible/action/template.py +++ b/zuul/ansible/action/template.py @@ -15,7 +15,7 @@ from zuul.ansible import paths -from zuul.ansible.plugins.action import template +from ansible.plugins.action import template class ActionModule(template.ActionModule): diff --git a/zuul/ansible/action/unarchive.py b/zuul/ansible/action/unarchive.py index c3f6e9197c..d6b2190e5e 100644 --- a/zuul/ansible/action/unarchive.py +++ b/zuul/ansible/action/unarchive.py @@ -15,7 +15,7 @@ from zuul.ansible import paths -from zuul.ansible.plugins.action import unarchive +from ansible.plugins.action import unarchive class ActionModule(unarchive.ActionModule): diff --git a/zuul/ansible/action/win_copy.py b/zuul/ansible/action/win_copy.py index eef3a1c5bb..c051630470 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 zuul.ansible.plugins.action import win_copy +from ansible.plugins.action import win_copy class ActionModule(win_copy.ActionModule): diff --git a/zuul/ansible/action/win_template.py b/zuul/ansible/action/win_template.py index 2a472160b4..de88eb8ff6 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 zuul.ansible.plugins.action import win_template +from ansible.plugins.action import win_template class ActionModule(win_template.ActionModule):