From 14682eb96d75fd2a1420720754b94acd4222918b Mon Sep 17 00:00:00 2001 From: Tiago Ilieve Date: Thu, 3 Apr 2014 19:08:04 -0300 Subject: [PATCH] Moving remaining plugins to bootstrapvz/plugins/ Three of the last developed plugins remained on the old `plugins/` folder. This probably happened because they didn't existed when the `documentation` branch were created, so they weren't moved when it was rebased against `master`. --- {plugins => bootstrapvz/plugins}/apt_proxy/__init__.py | 0 .../plugins}/apt_proxy/manifest-schema.json | 0 {plugins => bootstrapvz/plugins}/apt_proxy/tasks.py | 6 +++--- {plugins => bootstrapvz/plugins}/chef/__init__.py | 0 .../plugins}/chef/manifest-schema.json | 0 {plugins => bootstrapvz/plugins}/chef/tasks.py | 10 +++++----- {plugins => bootstrapvz/plugins}/ntp/__init__.py | 0 .../plugins}/ntp/manifest-schema.json | 0 {plugins => bootstrapvz/plugins}/ntp/tasks.py | 6 +++--- 9 files changed, 11 insertions(+), 11 deletions(-) rename {plugins => bootstrapvz/plugins}/apt_proxy/__init__.py (100%) rename {plugins => bootstrapvz/plugins}/apt_proxy/manifest-schema.json (100%) rename {plugins => bootstrapvz/plugins}/apt_proxy/tasks.py (87%) rename {plugins => bootstrapvz/plugins}/chef/__init__.py (100%) rename {plugins => bootstrapvz/plugins}/chef/manifest-schema.json (100%) rename {plugins => bootstrapvz/plugins}/chef/tasks.py (80%) rename {plugins => bootstrapvz/plugins}/ntp/__init__.py (100%) rename {plugins => bootstrapvz/plugins}/ntp/manifest-schema.json (100%) rename {plugins => bootstrapvz/plugins}/ntp/tasks.py (88%) diff --git a/plugins/apt_proxy/__init__.py b/bootstrapvz/plugins/apt_proxy/__init__.py similarity index 100% rename from plugins/apt_proxy/__init__.py rename to bootstrapvz/plugins/apt_proxy/__init__.py diff --git a/plugins/apt_proxy/manifest-schema.json b/bootstrapvz/plugins/apt_proxy/manifest-schema.json similarity index 100% rename from plugins/apt_proxy/manifest-schema.json rename to bootstrapvz/plugins/apt_proxy/manifest-schema.json diff --git a/plugins/apt_proxy/tasks.py b/bootstrapvz/plugins/apt_proxy/tasks.py similarity index 87% rename from plugins/apt_proxy/tasks.py rename to bootstrapvz/plugins/apt_proxy/tasks.py index 46b33e4..9d8dbc3 100644 --- a/plugins/apt_proxy/tasks.py +++ b/bootstrapvz/plugins/apt_proxy/tasks.py @@ -1,6 +1,6 @@ -from base import Task -from common import phases -from common.tasks import apt +from bootstrapvz.base import Task +from bootstrapvz.common import phases +from bootstrapvz.common.tasks import apt import os diff --git a/plugins/chef/__init__.py b/bootstrapvz/plugins/chef/__init__.py similarity index 100% rename from plugins/chef/__init__.py rename to bootstrapvz/plugins/chef/__init__.py diff --git a/plugins/chef/manifest-schema.json b/bootstrapvz/plugins/chef/manifest-schema.json similarity index 100% rename from plugins/chef/manifest-schema.json rename to bootstrapvz/plugins/chef/manifest-schema.json diff --git a/plugins/chef/tasks.py b/bootstrapvz/plugins/chef/tasks.py similarity index 80% rename from plugins/chef/tasks.py rename to bootstrapvz/plugins/chef/tasks.py index 15fde45..2f103bf 100644 --- a/plugins/chef/tasks.py +++ b/bootstrapvz/plugins/chef/tasks.py @@ -1,6 +1,6 @@ -from base import Task -from common import phases -from common.tasks import apt +from bootstrapvz.base import Task +from bootstrapvz.common import phases +from bootstrapvz.common.tasks import apt import os @@ -10,7 +10,7 @@ class CheckAssetsPath(Task): @classmethod def run(cls, info): - from common.exceptions import TaskError + from bootstrapvz.common.exceptions import TaskError assets = info.manifest.plugins['chef']['assets'] if not os.path.exists(assets): msg = 'The assets directory {assets} does not exist.'.format(assets=assets) @@ -36,5 +36,5 @@ class CopyChefAssets(Task): @classmethod def run(cls, info): - from common.tools import copy_tree + from bootstrapvz.common.tools import copy_tree copy_tree(info.manifest.plugins['chef']['assets'], os.path.join(info.root, 'etc/chef')) diff --git a/plugins/ntp/__init__.py b/bootstrapvz/plugins/ntp/__init__.py similarity index 100% rename from plugins/ntp/__init__.py rename to bootstrapvz/plugins/ntp/__init__.py diff --git a/plugins/ntp/manifest-schema.json b/bootstrapvz/plugins/ntp/manifest-schema.json similarity index 100% rename from plugins/ntp/manifest-schema.json rename to bootstrapvz/plugins/ntp/manifest-schema.json diff --git a/plugins/ntp/tasks.py b/bootstrapvz/plugins/ntp/tasks.py similarity index 88% rename from plugins/ntp/tasks.py rename to bootstrapvz/plugins/ntp/tasks.py index e143343..12e69e5 100644 --- a/plugins/ntp/tasks.py +++ b/bootstrapvz/plugins/ntp/tasks.py @@ -1,6 +1,6 @@ -from base import Task -from common import phases -from common.tasks import packages +from bootstrapvz.base import Task +from bootstrapvz.common import phases +from bootstrapvz.common.tasks import packages class AddNtpPackage(Task):