diff --git a/common/tasks/__init__.py b/common/tasks/__init__.py index e69de29..494ec79 100644 --- a/common/tasks/__init__.py +++ b/common/tasks/__init__.py @@ -0,0 +1,3 @@ +import os.path + +assets = os.path.normpath(os.path.join(os.path.dirname(__file__), '../assets')) diff --git a/common/tasks/initd.py b/common/tasks/initd.py index 5e52288..5a5da89 100644 --- a/common/tasks/initd.py +++ b/common/tasks/initd.py @@ -2,6 +2,7 @@ from base import Task from common import phases from common.exceptions import TaskError from common.tools import log_check_call +from . import assets import os.path @@ -31,7 +32,7 @@ class AddExpandRoot(Task): successors = [InstallInitScripts] def run(self, info): - init_scripts_dir = os.path.normpath(os.path.join(os.path.dirname(__file__), '../assets/init.d')) + init_scripts_dir = os.path.join(assets, 'init.d') info.initd['install']['expand-root'] = os.path.join(init_scripts_dir, 'expand-root') @@ -41,7 +42,7 @@ class AddSSHKeyGeneration(Task): successors = [InstallInitScripts] def run(self, info): - init_scripts_dir = os.path.normpath(os.path.join(os.path.dirname(__file__), '../assets/init.d')) + init_scripts_dir = os.path.join(assets, 'init.d') install = info.initd['install'] from subprocess import CalledProcessError try: diff --git a/plugins/opennebula/tasks.py b/plugins/opennebula/tasks.py index 68c800d..1c71432 100644 --- a/plugins/opennebula/tasks.py +++ b/plugins/opennebula/tasks.py @@ -3,6 +3,8 @@ from common import phases from common.tasks.locale import GenerateLocale import os +assets = os.path.normpath(os.path.join(os.path.dirname(__file__), 'assets')) + class OpenNebulaContext(Task): description = 'Setup OpenNebula init context' @@ -16,8 +18,7 @@ class OpenNebulaContext(Task): stat.S_IROTH | stat.S_IXOTH) from shutil import copy - assets_dir = os.path.normpath(os.path.join(os.path.dirname(__file__), 'assets')) - script_src = os.path.join(assets_dir, 'one-context_3.8.1.deb') + script_src = os.path.join(assets, 'one-context_3.8.1.deb') script_dst = os.path.join(info.root, 'tmp/one-context_3.8.1.deb') copy(script_src, script_dst) os.chmod(script_dst, rwxr_xr_x) @@ -34,11 +35,11 @@ class OpenNebulaContext(Task): '90', '2', '3', '4', '5', 'stop', '90', '0', '6']) # Load all pubkeys in root authorized_keys - script_src = os.path.join(assets_dir, 'one-pubkey.sh') + script_src = os.path.join(assets, 'one-pubkey.sh') script_dst = os.path.join(info.root, 'etc/one-context.d/one-pubkey.sh') copy(script_src, script_dst) # If USER_EC2_DATA is a script, execute it - script_src = os.path.join(assets_dir, 'one-ec2.sh') + script_src = os.path.join(assets, 'one-ec2.sh') script_dst = os.path.join(info.root, 'etc/one-context.d/one-ec2.sh') copy(script_src, script_dst) diff --git a/plugins/vagrant/tasks.py b/plugins/vagrant/tasks.py index 0bf5fd8..d60293f 100644 --- a/plugins/vagrant/tasks.py +++ b/plugins/vagrant/tasks.py @@ -5,6 +5,7 @@ from common.tasks import apt from plugins.admin_user.tasks import CreateAdminUser import os import shutil + assets = os.path.normpath(os.path.join(os.path.dirname(__file__), 'assets')) diff --git a/providers/ec2/tasks/__init__.py b/providers/ec2/tasks/__init__.py index e69de29..494ec79 100644 --- a/providers/ec2/tasks/__init__.py +++ b/providers/ec2/tasks/__init__.py @@ -0,0 +1,3 @@ +import os.path + +assets = os.path.normpath(os.path.join(os.path.dirname(__file__), '../assets')) diff --git a/providers/ec2/tasks/ami.py b/providers/ec2/tasks/ami.py index 801eb69..d9282c9 100644 --- a/providers/ec2/tasks/ami.py +++ b/providers/ec2/tasks/ami.py @@ -5,9 +5,10 @@ from common.tools import log_check_call from ebs import Snapshot from common.tasks import workspace from connection import Connect +from . import assets import os.path -cert_ec2 = os.path.normpath(os.path.join(os.path.dirname(__file__), '../assets/certs/cert-ec2.pem')) +cert_ec2 = os.path.join(assets, 'certs/cert-ec2.pem') class AMIName(Task): diff --git a/providers/ec2/tasks/boot.py b/providers/ec2/tasks/boot.py index 2af221e..b6af95e 100644 --- a/providers/ec2/tasks/boot.py +++ b/providers/ec2/tasks/boot.py @@ -1,5 +1,6 @@ from base import Task from common import phases +from . import assets import os @@ -19,7 +20,7 @@ class ConfigurePVGrub(Task): os.chmod(cfg, os.stat(cfg).st_mode & ~ x_all) from shutil import copy - script_src = os.path.normpath(os.path.join(os.path.dirname(__file__), '../assets/grub.d/40_custom')) + script_src = os.path.join(assets, 'grub.d/40_custom') script_dst = os.path.join(info.root, 'etc/grub.d/40_custom') copy(script_src, script_dst) os.chmod(script_dst, rwxr_xr_x) diff --git a/providers/ec2/tasks/initd.py b/providers/ec2/tasks/initd.py index 3e17b56..7ec4318 100644 --- a/providers/ec2/tasks/initd.py +++ b/providers/ec2/tasks/initd.py @@ -1,6 +1,7 @@ from base import Task from common import phases from common.tasks import initd +from . import assets import os.path @@ -13,6 +14,6 @@ class AddEC2InitScripts(Task): init_scripts = {'ec2-get-credentials': 'ec2-get-credentials', 'ec2-run-user-data': 'ec2-run-user-data'} - init_scripts_dir = os.path.normpath(os.path.join(os.path.dirname(__file__), '../assets/init.d')) + init_scripts_dir = os.path.join(assets, 'init.d') for name, path in init_scripts.iteritems(): info.initd['install'][name] = os.path.join(init_scripts_dir, path)