kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-10-10 17:19:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

PEP8 fixes

Browse source
This commit is contained in:
Tiago Ilieve 2014-04-27 10:14:02 -03:00
parent 2e5d291b9c
commit 51a3e488e3
9 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bootstrapvz/base/fs/__init__.py
View file

@ -30,5 +30,5 @@ def load_volume(data, bootloader):
'vmdk': VirtualMachineDisk,
'ebs': EBSVolume
}
# Create the volume with the partition map as an argument
# Create the volume with the partition map as an argument
return volume_backings.get(data['backing'])(partition_map)

1
bootstrapvz/common/__init__.py
View file

@ -1 +0,0 @@
from exceptions import *

8
bootstrapvz/common/tasks/apt.py
View file

@ -26,11 +26,11 @@ class AddDefaultSources(Task):
sections = 'main'
if 'sections' in info.manifest.system:
sections = ' '.join(info.manifest.system['sections'])
info.source_lists.add('main', 'deb {apt_mirror} {system.release} '+sections)
info.source_lists.add('main', 'deb-src {apt_mirror} {system.release} '+sections)
info.source_lists.add('main', 'deb {apt_mirror} {system.release} ' + sections)
info.source_lists.add('main', 'deb-src {apt_mirror} {system.release} ' + sections)
if info.release_codename != 'sid':
info.source_lists.add('main', 'deb http://security.debian.org/ {system.release}/updates '+sections)
info.source_lists.add('main', 'deb-src http://security.debian.org/ {system.release}/updates '+sections)
info.source_lists.add('main', 'deb http://security.debian.org/ {system.release}/updates ' + sections)
info.source_lists.add('main', 'deb-src http://security.debian.org/ {system.release}/updates ' + sections)
info.source_lists.add('main', 'deb {apt_mirror} {system.release}-updates ' + sections)
info.source_lists.add('main', 'deb-src {apt_mirror} {system.release}-updates ' + sections)

8
bootstrapvz/common/tasks/filesystem.py
View file

@ -144,10 +144,10 @@ class FStab(Task):
import os.path
p_map = info.volume.partition_map
mount_points = [{'path': '/',
'partition': p_map.root,
'dump': '1',
'pass_num': '1',
}]
'partition': p_map.root,
'dump': '1',
'pass_num': '1',
}]
if hasattr(p_map, 'boot'):
mount_points.append({'path': '/boot',
'partition': p_map.boot,

4
bootstrapvz/common/tools.py
View file

@ -70,7 +70,8 @@ def config_get(path, config_path):
config = config.get(key)
return config
def copy_tree(from_path,to_path):
def copy_tree(from_path, to_path):
from shutil import copy
import os
for abs_prefix, dirs, files in os.walk(from_path):
@ -86,4 +87,3 @@ def copy_tree(from_path,to_path):
for path in files:
copy(os.path.join(abs_prefix, path),
os.path.join(to_path, prefix, path))

4
bootstrapvz/plugins/cloud_init/__init__.py
View file

@ -14,9 +14,7 @@ def resolve_tasks(taskset, manifest):
if manifest.system['release'] in ['wheezy', 'stable']:
taskset.add(tasks.AddBackports)
taskset.update([ tasks.SetMetadataSource,
tasks.AddCloudInitPackages,
])
taskset.update([tasks.SetMetadataSource, tasks.AddCloudInitPackages])
options = manifest.plugins['cloud_init']
if 'username' in options:

1
bootstrapvz/plugins/opennebula/__init__.py
View file

@ -5,4 +5,3 @@ def resolve_tasks(taskset, manifest):
if manifest.system['release'] in ['wheezy', 'stable']:
taskset.add(tasks.AddBackports)
taskset.update([tasks.AddONEContextPackage])

2
bootstrapvz/plugins/opennebula/tasks.py
View file

@ -1,7 +1,6 @@
from bootstrapvz.base import Task
from bootstrapvz.common.tasks import apt
from bootstrapvz.common import phases
import os
class AddBackports(Task):
@ -18,6 +17,7 @@ class AddBackports(Task):
info.source_lists.add('backports', 'deb {apt_mirror} {system.release}-backports main')
info.source_lists.add('backports', 'deb-src {apt_mirror} {system.release}-backports main')
class AddONEContextPackage(Task):
description = 'Adding the OpenNebula context package'
phase = phases.preparation

2
bootstrapvz/plugins/puppet/tasks.py
View file

@ -2,6 +2,7 @@ from bootstrapvz.base import Task
from bootstrapvz.common import phases
from bootstrapvz.common.tasks import apt
from bootstrapvz.common.tasks import network
from bootstrapvz.common.tools import sed_i
import os
@ -82,7 +83,6 @@ class ApplyPuppetManifest(Task):
'puppet', 'apply', manifest_path])
os.remove(manifest_dst)
from bootstrapvz.common.tools import sed_i
hosts_path = os.path.join(info.root, 'etc/hosts')
sed_i(hosts_path, '127.0.0.1\s*{hostname}\n?'.format(hostname=hostname), '')