Fix all action plugins to import safely
This addresses the known issue with plugin inheritance in all action plugins. Change-Id: I8436d52ced0c96904375dc98da7c32ff2e47cb5e
This commit is contained in:
parent
4e5b0dedb9
commit
b1e6f6cf56
|
@ -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):
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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):
|
||||
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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):
|
||||
|
|
Loading…
Reference in New Issue