From b4c963ea95a184ead1a4e1f914ddfad4807c1af6 Mon Sep 17 00:00:00 2001 From: Anders Ingemann Date: Sat, 10 Aug 2013 23:42:25 +0200 Subject: [PATCH] Revert merge of raw+ONE, rename ONE provider to virtualbox --- plugins/opennebula/__init__.py | 5 +++++ .../opennebula}/assets/grub.d/40_custom | 0 .../opennebula}/assets/one-context_3.8.1.deb | Bin .../one => plugins/opennebula}/assets/one-ec2.sh | 0 .../one => plugins/opennebula}/assets/one-pubkey.sh | 0 .../tasks/context.py => plugins/opennebula/tasks.py | 0 providers/{one => virtualbox}/README.md | 0 providers/{one => virtualbox}/REAME.md | 0 providers/{one => virtualbox}/__init__.py | 2 -- providers/{one => virtualbox}/manifest-schema.json | 0 providers/{one => virtualbox}/manifest.py | 0 providers/{one => virtualbox}/tasks/__init__.py | 0 providers/{one => virtualbox}/tasks/boot.py | 0 providers/{one => virtualbox}/tasks/packages.py | 0 14 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 plugins/opennebula/__init__.py rename {providers/one => plugins/opennebula}/assets/grub.d/40_custom (100%) rename {providers/one => plugins/opennebula}/assets/one-context_3.8.1.deb (100%) rename {providers/one => plugins/opennebula}/assets/one-ec2.sh (100%) rename {providers/one => plugins/opennebula}/assets/one-pubkey.sh (100%) rename providers/one/tasks/context.py => plugins/opennebula/tasks.py (100%) rename providers/{one => virtualbox}/README.md (100%) rename providers/{one => virtualbox}/REAME.md (100%) rename providers/{one => virtualbox}/__init__.py (97%) rename providers/{one => virtualbox}/manifest-schema.json (100%) rename providers/{one => virtualbox}/manifest.py (100%) rename providers/{one => virtualbox}/tasks/__init__.py (100%) rename providers/{one => virtualbox}/tasks/boot.py (100%) rename providers/{one => virtualbox}/tasks/packages.py (100%) diff --git a/plugins/opennebula/__init__.py b/plugins/opennebula/__init__.py new file mode 100644 index 0000000..a9ae730 --- /dev/null +++ b/plugins/opennebula/__init__.py @@ -0,0 +1,5 @@ + + +def tasks(tasklist, manifest): + import tasks + tasklist.add(tasks.OpenNebulaContext()) diff --git a/providers/one/assets/grub.d/40_custom b/plugins/opennebula/assets/grub.d/40_custom similarity index 100% rename from providers/one/assets/grub.d/40_custom rename to plugins/opennebula/assets/grub.d/40_custom diff --git a/providers/one/assets/one-context_3.8.1.deb b/plugins/opennebula/assets/one-context_3.8.1.deb similarity index 100% rename from providers/one/assets/one-context_3.8.1.deb rename to plugins/opennebula/assets/one-context_3.8.1.deb diff --git a/providers/one/assets/one-ec2.sh b/plugins/opennebula/assets/one-ec2.sh similarity index 100% rename from providers/one/assets/one-ec2.sh rename to plugins/opennebula/assets/one-ec2.sh diff --git a/providers/one/assets/one-pubkey.sh b/plugins/opennebula/assets/one-pubkey.sh similarity index 100% rename from providers/one/assets/one-pubkey.sh rename to plugins/opennebula/assets/one-pubkey.sh diff --git a/providers/one/tasks/context.py b/plugins/opennebula/tasks.py similarity index 100% rename from providers/one/tasks/context.py rename to plugins/opennebula/tasks.py diff --git a/providers/one/README.md b/providers/virtualbox/README.md similarity index 100% rename from providers/one/README.md rename to providers/virtualbox/README.md diff --git a/providers/one/REAME.md b/providers/virtualbox/REAME.md similarity index 100% rename from providers/one/REAME.md rename to providers/virtualbox/REAME.md diff --git a/providers/one/__init__.py b/providers/virtualbox/__init__.py similarity index 97% rename from providers/one/__init__.py rename to providers/virtualbox/__init__.py index 430e99b..06d0e88 100644 --- a/providers/one/__init__.py +++ b/providers/virtualbox/__init__.py @@ -9,7 +9,6 @@ from common.tasks import locale from common.tasks import apt from tasks import boot from common.tasks import boot as common_boot -from tasks import context from common.tasks import security from common.tasks import network from common.tasks import initd @@ -36,7 +35,6 @@ def tasks(tasklist, manifest): bootstrap.Bootstrap(), filesystem.MountSpecials(), locale.GenerateLocale(), - context.OpenNebulaContext(), locale.SetTimezone(), apt.DisableDaemonAutostart(), apt.AptSources(), diff --git a/providers/one/manifest-schema.json b/providers/virtualbox/manifest-schema.json similarity index 100% rename from providers/one/manifest-schema.json rename to providers/virtualbox/manifest-schema.json diff --git a/providers/one/manifest.py b/providers/virtualbox/manifest.py similarity index 100% rename from providers/one/manifest.py rename to providers/virtualbox/manifest.py diff --git a/providers/one/tasks/__init__.py b/providers/virtualbox/tasks/__init__.py similarity index 100% rename from providers/one/tasks/__init__.py rename to providers/virtualbox/tasks/__init__.py diff --git a/providers/one/tasks/boot.py b/providers/virtualbox/tasks/boot.py similarity index 100% rename from providers/one/tasks/boot.py rename to providers/virtualbox/tasks/boot.py diff --git a/providers/one/tasks/packages.py b/providers/virtualbox/tasks/packages.py similarity index 100% rename from providers/one/tasks/packages.py rename to providers/virtualbox/tasks/packages.py