PEP8 fixes

This commit is contained in:
Tiago Ilieve 2014-04-27 11:05:53 -03:00
parent 014e230221
commit 47997b4b13
10 changed files with 29 additions and 37 deletions

View file

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

View file

@ -52,7 +52,6 @@ class SetUsername(Task):
class SetMetadataSource(Task): class SetMetadataSource(Task):
description = 'Setting metadata source' description = 'Setting metadata source'
#phase = phases.system_modification
phase = phases.package_installation phase = phases.package_installation
successors = [apt.AptUpdate] successors = [apt.AptUpdate]

View file

@ -1,7 +1,6 @@
from bootstrapvz.base import Task from bootstrapvz.base import Task
from bootstrapvz.common.tasks import apt from bootstrapvz.common.tasks import apt
from bootstrapvz.common import phases from bootstrapvz.common import phases
import os
class AddBackports(Task): class AddBackports(Task):

View file

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

View file

@ -10,7 +10,6 @@ def validate_manifest(data, validator, error):
def resolve_tasks(taskset, manifest): def resolve_tasks(taskset, manifest):
from bootstrapvz.common.tasks import security from bootstrapvz.common.tasks import security
from bootstrapvz.common.tasks import loopback from bootstrapvz.common.tasks import loopback
from bootstrapvz.common.tasks import network
taskset.discard(security.DisableSSHPasswordAuthentication) taskset.discard(security.DisableSSHPasswordAuthentication)
taskset.discard(loopback.MoveImage) taskset.discard(loopback.MoveImage)

View file

@ -1,6 +1,5 @@
from bootstrapvz.base import Task from bootstrapvz.base import Task
from bootstrapvz.common import phases from bootstrapvz.common import phases
from bootstrapvz.common.tasks import loopback
class ConvertToVhd(Task): class ConvertToVhd(Task):

View file

@ -43,9 +43,7 @@ def resolve_tasks(taskset, manifest):
taskset.add(network.RemoveHostname) taskset.add(network.RemoveHostname)
taskset.update([tasks.packages.DefaultPackages, taskset.update([tasks.packages.DefaultPackages,
loopback.Create, loopback.Create,
security.EnableShadowConfig, security.EnableShadowConfig,
network.RemoveDNSInfo, network.RemoveDNSInfo,
network.ConfigureNetworkIF, network.ConfigureNetworkIF,
@ -53,7 +51,6 @@ def resolve_tasks(taskset, manifest):
initd.InstallInitScripts, initd.InstallInitScripts,
cleanup.ClearMOTD, cleanup.ClearMOTD,
cleanup.CleanTMP, cleanup.CleanTMP,
loopback.MoveImage, loopback.MoveImage,
]) ])