From 7fb55c7a9b98960d6bd41cb62db72b4e8a0be14d Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Thu, 2 Oct 2014 13:36:41 -0400 Subject: [PATCH] Some restructuring. --- lib/v2/{cache => common/config}/__init__.py | 0 lib/v2/{ => common}/errors/__init__.py | 0 lib/v2/modules/docs/fragments/__init__.py | 17 ----------------- lib/v2/modules/utils/__init__.py | 17 ----------------- .../{config/__init__.py => playbook/include.py} | 0 .../{modules/__init__.py => playbook/vars.py} | 0 .../docs/__init__.py => playbook/vars_file.py} | 0 lib/v2/runner/__init__.py | 16 +--------------- lib/v2/utils/__init__.py | 17 ----------------- 9 files changed, 1 insertion(+), 66 deletions(-) rename lib/v2/{cache => common/config}/__init__.py (100%) rename lib/v2/{ => common}/errors/__init__.py (100%) delete mode 100644 lib/v2/modules/docs/fragments/__init__.py delete mode 100644 lib/v2/modules/utils/__init__.py rename lib/v2/{config/__init__.py => playbook/include.py} (100%) rename lib/v2/{modules/__init__.py => playbook/vars.py} (100%) rename lib/v2/{modules/docs/__init__.py => playbook/vars_file.py} (100%) delete mode 100644 lib/v2/utils/__init__.py diff --git a/lib/v2/cache/__init__.py b/lib/v2/common/config/__init__.py similarity index 100% rename from lib/v2/cache/__init__.py rename to lib/v2/common/config/__init__.py diff --git a/lib/v2/errors/__init__.py b/lib/v2/common/errors/__init__.py similarity index 100% rename from lib/v2/errors/__init__.py rename to lib/v2/common/errors/__init__.py diff --git a/lib/v2/modules/docs/fragments/__init__.py b/lib/v2/modules/docs/fragments/__init__.py deleted file mode 100644 index d6c11ffa742..00000000000 --- a/lib/v2/modules/docs/fragments/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# (c) 2012-2014, Michael DeHaan -# -# This file is part of Ansible -# -# Ansible is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Ansible is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Ansible. If not, see . - diff --git a/lib/v2/modules/utils/__init__.py b/lib/v2/modules/utils/__init__.py deleted file mode 100644 index d6c11ffa742..00000000000 --- a/lib/v2/modules/utils/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# (c) 2012-2014, Michael DeHaan -# -# This file is part of Ansible -# -# Ansible is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Ansible is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Ansible. If not, see . - diff --git a/lib/v2/config/__init__.py b/lib/v2/playbook/include.py similarity index 100% rename from lib/v2/config/__init__.py rename to lib/v2/playbook/include.py diff --git a/lib/v2/modules/__init__.py b/lib/v2/playbook/vars.py similarity index 100% rename from lib/v2/modules/__init__.py rename to lib/v2/playbook/vars.py diff --git a/lib/v2/modules/docs/__init__.py b/lib/v2/playbook/vars_file.py similarity index 100% rename from lib/v2/modules/docs/__init__.py rename to lib/v2/playbook/vars_file.py diff --git a/lib/v2/runner/__init__.py b/lib/v2/runner/__init__.py index 2e60a96faa8..ebebb9cfc01 100644 --- a/lib/v2/runner/__init__.py +++ b/lib/v2/runner/__init__.py @@ -19,18 +19,4 @@ from v2.inventory import Host from v2.playbook import Task class Runner(object): - def __init__(self, host, task): - self.host = host - self.task = task - self.action = self.get_action() - - def get_action(self): - # returns the action plugin from plugins/action/ - # for the given task - return None - - def execute(self): - # runs the given task on the given host using - # the action determined by get_action() - return - + pass diff --git a/lib/v2/utils/__init__.py b/lib/v2/utils/__init__.py deleted file mode 100644 index d6c11ffa742..00000000000 --- a/lib/v2/utils/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# (c) 2012-2014, Michael DeHaan -# -# This file is part of Ansible -# -# Ansible is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Ansible is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Ansible. If not, see . -