mirror of
https://github.com/kevingruesser/bootstrap-vz.git
synced 2025-08-22 18:00:35 +00:00
fix pylint W0403(relative-import) paths
This commit is contained in:
Carlos Meza
parent
6e183914ac
commit
4e1864aa2b
9 changed files with 137 additions and 154 deletions
|
|
@ -1,8 +1,6 @@
|
||||||
from . import tasks.mounts
|
|
||||||
from . import tasks.shrink
|
|
||||||
from . import tasks.apt
|
|
||||||
from . import tasks.dpkg
|
|
||||||
from bootstrapvz.common.tasks import locale
|
from bootstrapvz.common.tasks import locale
|
||||||
|
from .tasks import mounts, shrink, apt, dpkg
|
||||||
|
import bootstrapvz.common.tasks.dpkg
|
||||||
|
|
||||||
|
|
||||||
def get_shrink_type(plugins):
|
def get_shrink_type(plugins):
|
||||||
|
|
@ -33,47 +31,47 @@ def validate_manifest(data, validator, error):
|
||||||
|
|
||||||
|
|
||||||
def resolve_tasks(taskset, manifest):
|
def resolve_tasks(taskset, manifest):
|
||||||
taskset.update([tasks.mounts.AddFolderMounts,
|
taskset.update([mounts.AddFolderMounts,
|
||||||
tasks.mounts.RemoveFolderMounts,
|
mounts.RemoveFolderMounts,
|
||||||
])
|
])
|
||||||
if manifest.plugins['minimize_size'].get('zerofree', False):
|
if manifest.plugins['minimize_size'].get('zerofree', False):
|
||||||
taskset.add(tasks.shrink.AddRequiredZeroFreeCommand)
|
taskset.add(shrink.AddRequiredZeroFreeCommand)
|
||||||
taskset.add(tasks.shrink.Zerofree)
|
taskset.add(shrink.Zerofree)
|
||||||
if get_shrink_type(manifest.plugins) == 'vmware-vdiskmanager':
|
if get_shrink_type(manifest.plugins) == 'vmware-vdiskmanager':
|
||||||
taskset.add(tasks.shrink.AddRequiredVDiskManagerCommand)
|
taskset.add(shrink.AddRequiredVDiskManagerCommand)
|
||||||
taskset.add(tasks.shrink.ShrinkVolumeWithVDiskManager)
|
taskset.add(shrink.ShrinkVolumeWithVDiskManager)
|
||||||
if get_shrink_type(manifest.plugins) == 'qemu-img':
|
if get_shrink_type(manifest.plugins) == 'qemu-img':
|
||||||
taskset.add(tasks.shrink.AddRequiredQemuImgCommand)
|
taskset.add(shrink.AddRequiredQemuImgCommand)
|
||||||
taskset.add(tasks.shrink.ShrinkVolumeWithQemuImg)
|
taskset.add(shrink.ShrinkVolumeWithQemuImg)
|
||||||
if 'apt' in manifest.plugins['minimize_size']:
|
if 'apt' in manifest.plugins['minimize_size']:
|
||||||
apt = manifest.plugins['minimize_size']['apt']
|
msapt = manifest.plugins['minimize_size']['apt']
|
||||||
if apt.get('autoclean', False):
|
if msapt.get('autoclean', False):
|
||||||
taskset.add(tasks.apt.AutomateAptClean)
|
taskset.add(apt.AutomateAptClean)
|
||||||
if 'languages' in apt:
|
if 'languages' in msapt:
|
||||||
taskset.add(tasks.apt.FilterTranslationFiles)
|
taskset.add(apt.FilterTranslationFiles)
|
||||||
if apt.get('gzip_indexes', False):
|
if msapt.get('gzip_indexes', False):
|
||||||
taskset.add(tasks.apt.AptGzipIndexes)
|
taskset.add(apt.AptGzipIndexes)
|
||||||
if apt.get('autoremove_suggests', False):
|
if msapt.get('autoremove_suggests', False):
|
||||||
taskset.add(tasks.apt.AptAutoremoveSuggests)
|
taskset.add(apt.AptAutoremoveSuggests)
|
||||||
if 'dpkg' in manifest.plugins['minimize_size']:
|
if 'dpkg' in manifest.plugins['minimize_size']:
|
||||||
filter_tasks = [dpkg.CreateDpkgCfg,
|
filter_tasks = [bootstrapvz.common.tasks.dpkg.CreateDpkgCfg,
|
||||||
tasks.dpkg.InitializeBootstrapFilterList,
|
dpkg.InitializeBootstrapFilterList,
|
||||||
tasks.dpkg.CreateBootstrapFilterScripts,
|
dpkg.CreateBootstrapFilterScripts,
|
||||||
tasks.dpkg.DeleteBootstrapFilterScripts,
|
dpkg.DeleteBootstrapFilterScripts,
|
||||||
]
|
]
|
||||||
msdpkg = manifest.plugins['minimize_size']['dpkg']
|
msdpkg = manifest.plugins['minimize_size']['dpkg']
|
||||||
if 'locales' in msdpkg:
|
if 'locales' in msdpkg:
|
||||||
taskset.update(filter_tasks)
|
taskset.update(filter_tasks)
|
||||||
taskset.add(tasks.dpkg.FilterLocales)
|
taskset.add(dpkg.FilterLocales)
|
||||||
# If no locales are selected, we don't need the locale package
|
# If no locales are selected, we don't need the locale package
|
||||||
if msdpkg['locales']:
|
if msdpkg['locales']:
|
||||||
taskset.discard(locale.LocaleBootstrapPackage)
|
taskset.discard(locale.LocaleBootstrapPackage)
|
||||||
taskset.discard(locale.GenerateLocale)
|
taskset.discard(locale.GenerateLocale)
|
||||||
if msdpkg.get('exclude_docs', False):
|
if msdpkg.get('exclude_docs', False):
|
||||||
taskset.update(filter_tasks)
|
taskset.update(filter_tasks)
|
||||||
taskset.add(tasks.dpkg.ExcludeDocs)
|
taskset.add(dpkg.ExcludeDocs)
|
||||||
|
|
||||||
|
|
||||||
def resolve_rollback_tasks(taskset, manifest, completed, counter_task):
|
def resolve_rollback_tasks(taskset, manifest, completed, counter_task):
|
||||||
counter_task(taskset, tasks.mounts.AddFolderMounts, tasks.mounts.RemoveFolderMounts)
|
counter_task(taskset, mounts.AddFolderMounts, mounts.RemoveFolderMounts)
|
||||||
counter_task(taskset, tasks.dpkg.CreateBootstrapFilterScripts, tasks.dpkg.DeleteBootstrapFilterScripts)
|
counter_task(taskset, dpkg.CreateBootstrapFilterScripts, dpkg.DeleteBootstrapFilterScripts)
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,11 @@
|
||||||
from bootstrapvz.common import task_groups
|
from bootstrapvz.common import task_groups
|
||||||
from . import tasks.packages
|
|
||||||
from . import tasks.boot
|
|
||||||
from bootstrapvz.common.tasks import image
|
from bootstrapvz.common.tasks import image
|
||||||
from bootstrapvz.common.tasks import loopback
|
from bootstrapvz.common.tasks import loopback
|
||||||
from bootstrapvz.common.tasks import initd
|
from bootstrapvz.common.tasks import initd
|
||||||
from bootstrapvz.common.tasks import ssh
|
from bootstrapvz.common.tasks import ssh
|
||||||
from bootstrapvz.common.tasks import apt
|
from bootstrapvz.common.tasks import apt
|
||||||
from bootstrapvz.common.tasks import grub
|
from bootstrapvz.common.tasks import grub
|
||||||
|
from .tasks import packages, boot
|
||||||
|
|
||||||
|
|
||||||
def validate_manifest(data, validator, error):
|
def validate_manifest(data, validator, error):
|
||||||
|
|
@ -17,7 +16,7 @@ def validate_manifest(data, validator, error):
|
||||||
def resolve_tasks(taskset, manifest):
|
def resolve_tasks(taskset, manifest):
|
||||||
taskset.update(task_groups.get_standard_groups(manifest))
|
taskset.update(task_groups.get_standard_groups(manifest))
|
||||||
taskset.update([apt.AddBackports,
|
taskset.update([apt.AddBackports,
|
||||||
tasks.packages.DefaultPackages,
|
packages.DefaultPackages,
|
||||||
loopback.AddRequiredCommands,
|
loopback.AddRequiredCommands,
|
||||||
loopback.Create,
|
loopback.Create,
|
||||||
image.MoveImage,
|
image.MoveImage,
|
||||||
|
|
@ -25,9 +24,9 @@ def resolve_tasks(taskset, manifest):
|
||||||
ssh.AddOpenSSHPackage,
|
ssh.AddOpenSSHPackage,
|
||||||
ssh.ShredHostkeys,
|
ssh.ShredHostkeys,
|
||||||
ssh.AddSSHKeyGeneration,
|
ssh.AddSSHKeyGeneration,
|
||||||
tasks.packages.Waagent,
|
packages.Waagent,
|
||||||
tasks.boot.ConfigureGrub,
|
boot.ConfigureGrub,
|
||||||
tasks.boot.PatchUdev,
|
boot.PatchUdev,
|
||||||
])
|
])
|
||||||
taskset.discard(grub.SetGrubConsolOutputDeviceToSerial)
|
taskset.discard(grub.SetGrubConsolOutputDeviceToSerial)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,7 @@
|
||||||
from bootstrapvz.common import task_groups
|
from bootstrapvz.common import task_groups
|
||||||
from bootstrapvz.common.tasks import apt, dpkg, folder, filesystem
|
from bootstrapvz.common.tasks import apt, dpkg, folder, filesystem
|
||||||
from bootstrapvz.common.tools import rel_path
|
from bootstrapvz.common.tools import rel_path
|
||||||
from . import tasks.commands
|
from .tasks import commands, image, settings
|
||||||
from . import tasks.image
|
|
||||||
from . import tasks.settings
|
|
||||||
|
|
||||||
|
|
||||||
def validate_manifest(data, validator, error):
|
def validate_manifest(data, validator, error):
|
||||||
|
|
@ -28,17 +26,17 @@ def resolve_tasks(taskset, manifest):
|
||||||
# Let the autostart of daemons by apt remain disabled
|
# Let the autostart of daemons by apt remain disabled
|
||||||
taskset.discard(apt.EnableDaemonAutostart)
|
taskset.discard(apt.EnableDaemonAutostart)
|
||||||
|
|
||||||
taskset.update([tasks.commands.AddRequiredCommands,
|
taskset.update([commands.AddRequiredCommands,
|
||||||
tasks.image.CreateDockerfileEntry,
|
image.CreateDockerfileEntry,
|
||||||
tasks.image.CreateImage,
|
image.CreateImage,
|
||||||
tasks.settings.DpkgUnsafeIo,
|
settings.DpkgUnsafeIo,
|
||||||
tasks.settings.AutoRemoveKernel,
|
settings.AutoRemoveKernel,
|
||||||
tasks.settings.SystemdContainer
|
settings.SystemdContainer
|
||||||
])
|
])
|
||||||
if 'labels' in manifest.provider:
|
if 'labels' in manifest.provider:
|
||||||
taskset.add(tasks.image.PopulateLabels)
|
taskset.add(image.PopulateLabels)
|
||||||
if 'dockerfile' in manifest.provider:
|
if 'dockerfile' in manifest.provider:
|
||||||
taskset.add(tasks.image.AppendManifestDockerfile)
|
taskset.add(image.AppendManifestDockerfile)
|
||||||
|
|
||||||
|
|
||||||
def resolve_rollback_tasks(taskset, manifest, completed, counter_task):
|
def resolve_rollback_tasks(taskset, manifest, completed, counter_task):
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,10 @@
|
||||||
from bootstrapvz.common import task_groups
|
from bootstrapvz.common import task_groups
|
||||||
from . import tasks.packages
|
from .tasks import packages, connection, host, ami, ebs, filesystem, boot, network, initd, tuning
|
||||||
from . import tasks.connection
|
import bootstrapvz.common.tasks.boot
|
||||||
from . import tasks.host
|
import bootstrapvz.common.tasks.filesystem
|
||||||
from . import tasks.ami
|
import bootstrapvz.common.tasks.grub
|
||||||
from . import tasks.ebs
|
import bootstrapvz.common.tasks.initd
|
||||||
from . import tasks.filesystem
|
from bootstrapvz.common.tasks import apt, kernel, loopback, volume
|
||||||
from . import tasks.boot
|
|
||||||
from . import tasks.network
|
|
||||||
from . import tasks.initd
|
|
||||||
from . import tasks.tuning
|
|
||||||
from bootstrapvz.common.tasks import apt, boot, filesystem, grub, initd
|
|
||||||
from bootstrapvz.common.tasks import kernel, loopback, volume
|
|
||||||
from bootstrapvz.common.tools import rel_path
|
from bootstrapvz.common.tools import rel_path
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -57,94 +51,94 @@ def resolve_tasks(taskset, manifest):
|
||||||
taskset.update(task_groups.get_standard_groups(manifest))
|
taskset.update(task_groups.get_standard_groups(manifest))
|
||||||
taskset.update(task_groups.ssh_group)
|
taskset.update(task_groups.ssh_group)
|
||||||
|
|
||||||
taskset.update([tasks.host.AddExternalCommands,
|
taskset.update([host.AddExternalCommands,
|
||||||
tasks.packages.DefaultPackages,
|
packages.DefaultPackages,
|
||||||
tasks.connection.SilenceBotoDebug,
|
connection.SilenceBotoDebug,
|
||||||
tasks.connection.GetCredentials,
|
connection.GetCredentials,
|
||||||
tasks.ami.AMIName,
|
ami.AMIName,
|
||||||
tasks.connection.Connect,
|
connection.Connect,
|
||||||
|
|
||||||
tasks.tuning.TuneSystem,
|
tuning.TuneSystem,
|
||||||
tasks.tuning.BlackListModules,
|
tuning.BlackListModules,
|
||||||
boot.BlackListModules,
|
bootstrapvz.common.tasks.boot.BlackListModules,
|
||||||
boot.DisableGetTTYs,
|
bootstrapvz.common.tasks.boot.DisableGetTTYs,
|
||||||
tasks.boot.AddXenGrubConsoleOutputDevice,
|
boot.AddXenGrubConsoleOutputDevice,
|
||||||
grub.WriteGrubConfig,
|
bootstrapvz.common.tasks.grub.WriteGrubConfig,
|
||||||
tasks.boot.UpdateGrubConfig,
|
boot.UpdateGrubConfig,
|
||||||
initd.AddExpandRoot,
|
bootstrapvz.common.tasks.initd.AddExpandRoot,
|
||||||
initd.RemoveHWClock,
|
bootstrapvz.common.tasks.initd.RemoveHWClock,
|
||||||
initd.InstallInitScripts,
|
bootstrapvz.common.tasks.initd.InstallInitScripts,
|
||||||
tasks.ami.RegisterAMI,
|
ami.RegisterAMI,
|
||||||
])
|
])
|
||||||
|
|
||||||
if manifest.release > wheezy:
|
if manifest.release > wheezy:
|
||||||
taskset.add(tasks.network.InstallNetworkingUDevHotplugAndDHCPSubinterface)
|
taskset.add(network.InstallNetworkingUDevHotplugAndDHCPSubinterface)
|
||||||
|
|
||||||
if manifest.release <= wheezy:
|
if manifest.release <= wheezy:
|
||||||
# The default DHCP client `isc-dhcp' doesn't work properly on wheezy and earlier
|
# The default DHCP client `isc-dhcp' doesn't work properly on wheezy and earlier
|
||||||
taskset.add(tasks.network.InstallDHCPCD)
|
taskset.add(network.InstallDHCPCD)
|
||||||
taskset.add(tasks.network.EnableDHCPCDDNS)
|
taskset.add(network.EnableDHCPCDDNS)
|
||||||
|
|
||||||
if manifest.release >= jessie:
|
if manifest.release >= jessie:
|
||||||
taskset.add(tasks.packages.AddWorkaroundGrowpart)
|
taskset.add(packages.AddWorkaroundGrowpart)
|
||||||
taskset.add(initd.AdjustGrowpartWorkaround)
|
taskset.add(bootstrapvz.common.tasks.initd.AdjustGrowpartWorkaround)
|
||||||
if manifest.system['bootloader'] == 'grub':
|
if manifest.system['bootloader'] == 'grub':
|
||||||
taskset.add(grub.EnableSystemd)
|
taskset.add(bootstrapvz.common.tasks.grub.EnableSystemd)
|
||||||
if manifest.release <= stable:
|
if manifest.release <= stable:
|
||||||
taskset.add(apt.AddBackports)
|
taskset.add(apt.AddBackports)
|
||||||
|
|
||||||
if manifest.provider.get('install_init_scripts', True):
|
if manifest.provider.get('install_init_scripts', True):
|
||||||
taskset.add(tasks.initd.AddEC2InitScripts)
|
taskset.add(initd.AddEC2InitScripts)
|
||||||
|
|
||||||
if manifest.volume['partitions']['type'] != 'none':
|
if manifest.volume['partitions']['type'] != 'none':
|
||||||
taskset.add(initd.AdjustExpandRootScript)
|
taskset.add(bootstrapvz.common.tasks.initd.AdjustExpandRootScript)
|
||||||
|
|
||||||
if manifest.system['bootloader'] == 'pvgrub':
|
if manifest.system['bootloader'] == 'pvgrub':
|
||||||
taskset.add(grub.AddGrubPackage)
|
taskset.add(bootstrapvz.common.tasks.grub.AddGrubPackage)
|
||||||
taskset.update([grub.AddGrubPackage,
|
taskset.update([bootstrapvz.common.tasks.grub.AddGrubPackage,
|
||||||
grub.InitGrubConfig,
|
bootstrapvz.common.tasks.grub.InitGrubConfig,
|
||||||
grub.SetGrubTerminalToConsole,
|
bootstrapvz.common.tasks.grub.SetGrubTerminalToConsole,
|
||||||
grub.SetGrubConsolOutputDeviceToSerial,
|
bootstrapvz.common.tasks.grub.SetGrubConsolOutputDeviceToSerial,
|
||||||
grub.RemoveGrubTimeout,
|
bootstrapvz.common.tasks.grub.RemoveGrubTimeout,
|
||||||
grub.DisableGrubRecovery,
|
bootstrapvz.common.tasks.grub.DisableGrubRecovery,
|
||||||
tasks.boot.CreatePVGrubCustomRule,
|
boot.CreatePVGrubCustomRule,
|
||||||
tasks.boot.ConfigurePVGrub,
|
boot.ConfigurePVGrub,
|
||||||
grub.WriteGrubConfig,
|
bootstrapvz.common.tasks.grub.WriteGrubConfig,
|
||||||
tasks.boot.UpdateGrubConfig,
|
boot.UpdateGrubConfig,
|
||||||
tasks.boot.LinkGrubConfig])
|
boot.LinkGrubConfig])
|
||||||
|
|
||||||
if manifest.volume['backing'].lower() == 'ebs':
|
if manifest.volume['backing'].lower() == 'ebs':
|
||||||
taskset.update([tasks.host.GetInstanceMetadata,
|
taskset.update([host.GetInstanceMetadata,
|
||||||
tasks.ebs.Create,
|
ebs.Create,
|
||||||
tasks.ebs.Snapshot,
|
ebs.Snapshot,
|
||||||
])
|
])
|
||||||
taskset.add(tasks.ebs.Attach)
|
taskset.add(ebs.Attach)
|
||||||
taskset.discard(volume.Attach)
|
taskset.discard(volume.Attach)
|
||||||
|
|
||||||
if manifest.volume['backing'].lower() == 's3':
|
if manifest.volume['backing'].lower() == 's3':
|
||||||
taskset.update([loopback.AddRequiredCommands,
|
taskset.update([loopback.AddRequiredCommands,
|
||||||
tasks.host.SetRegion,
|
host.SetRegion,
|
||||||
loopback.Create,
|
loopback.Create,
|
||||||
tasks.filesystem.S3FStab,
|
filesystem.S3FStab,
|
||||||
tasks.ami.BundleImage,
|
ami.BundleImage,
|
||||||
tasks.ami.UploadImage,
|
ami.UploadImage,
|
||||||
tasks.ami.RemoveBundle,
|
ami.RemoveBundle,
|
||||||
])
|
])
|
||||||
taskset.discard(filesystem.FStab)
|
taskset.discard(bootstrapvz.common.tasks.filesystem.FStab)
|
||||||
|
|
||||||
if manifest.provider.get('enhanced_networking', None) == 'simple':
|
if manifest.provider.get('enhanced_networking', None) == 'simple':
|
||||||
taskset.update([kernel.AddDKMSPackages,
|
taskset.update([kernel.AddDKMSPackages,
|
||||||
tasks.network.InstallEnhancedNetworking,
|
network.InstallEnhancedNetworking,
|
||||||
tasks.network.InstallENANetworking,
|
network.InstallENANetworking,
|
||||||
kernel.UpdateInitramfs])
|
kernel.UpdateInitramfs])
|
||||||
|
|
||||||
taskset.update([filesystem.Format,
|
taskset.update([bootstrapvz.common.tasks.filesystem.Format,
|
||||||
volume.Delete,
|
volume.Delete,
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
||||||
def resolve_rollback_tasks(taskset, manifest, completed, counter_task):
|
def resolve_rollback_tasks(taskset, manifest, completed, counter_task):
|
||||||
taskset.update(task_groups.get_standard_rollback_tasks(completed))
|
taskset.update(task_groups.get_standard_rollback_tasks(completed))
|
||||||
counter_task(taskset, tasks.ebs.Create, volume.Delete)
|
counter_task(taskset, ebs.Create, volume.Delete)
|
||||||
counter_task(taskset, tasks.ebs.Attach, volume.Detach)
|
counter_task(taskset, ebs.Attach, volume.Detach)
|
||||||
counter_task(taskset, tasks.ami.BundleImage, tasks.ami.RemoveBundle)
|
counter_task(taskset, ami.BundleImage, ami.RemoveBundle)
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,9 @@
|
||||||
|
import bootstrapvz.common.tasks.apt
|
||||||
|
import bootstrapvz.common.tasks.boot
|
||||||
|
import bootstrapvz.common.tasks.image
|
||||||
|
from bootstrapvz.common.tasks import loopback, initd, ssh, volume, grub
|
||||||
from bootstrapvz.common import task_groups
|
from bootstrapvz.common import task_groups
|
||||||
from . import tasks.apt
|
from .tasks import apt, boot, configuration, image, packages
|
||||||
from . import tasks.boot
|
|
||||||
from . import tasks.configuration
|
|
||||||
from . import tasks.image
|
|
||||||
from . import tasks.packages
|
|
||||||
from bootstrapvz.common.tasks import apt, boot, image, loopback, initd
|
|
||||||
from bootstrapvz.common.tasks import ssh, volume, grub
|
|
||||||
|
|
||||||
|
|
||||||
def validate_manifest(data, validator, error):
|
def validate_manifest(data, validator, error):
|
||||||
|
|
@ -15,30 +13,30 @@ def validate_manifest(data, validator, error):
|
||||||
|
|
||||||
def resolve_tasks(taskset, manifest):
|
def resolve_tasks(taskset, manifest):
|
||||||
taskset.update(task_groups.get_standard_groups(manifest))
|
taskset.update(task_groups.get_standard_groups(manifest))
|
||||||
taskset.update([apt.AddBackports,
|
taskset.update([bootstrapvz.common.tasks.apt.AddBackports,
|
||||||
apt.AddDefaultSources,
|
bootstrapvz.common.tasks.apt.AddDefaultSources,
|
||||||
loopback.AddRequiredCommands,
|
loopback.AddRequiredCommands,
|
||||||
loopback.Create,
|
loopback.Create,
|
||||||
tasks.packages.DefaultPackages,
|
packages.DefaultPackages,
|
||||||
tasks.configuration.GatherReleaseInformation,
|
configuration.GatherReleaseInformation,
|
||||||
tasks.boot.ConfigureGrub,
|
boot.ConfigureGrub,
|
||||||
initd.InstallInitScripts,
|
initd.InstallInitScripts,
|
||||||
boot.BlackListModules,
|
bootstrapvz.common.tasks.boot.BlackListModules,
|
||||||
boot.UpdateInitramfs,
|
bootstrapvz.common.tasks.boot.UpdateInitramfs,
|
||||||
ssh.AddSSHKeyGeneration,
|
ssh.AddSSHKeyGeneration,
|
||||||
ssh.DisableSSHPasswordAuthentication,
|
ssh.DisableSSHPasswordAuthentication,
|
||||||
ssh.DisableRootLogin,
|
ssh.DisableRootLogin,
|
||||||
tasks.apt.AddBaselineAptCache,
|
apt.AddBaselineAptCache,
|
||||||
image.MoveImage,
|
bootstrapvz.common.tasks.image.MoveImage,
|
||||||
tasks.image.CreateTarball,
|
image.CreateTarball,
|
||||||
volume.Delete,
|
volume.Delete,
|
||||||
])
|
])
|
||||||
taskset.discard(grub.SetGrubConsolOutputDeviceToSerial)
|
taskset.discard(grub.SetGrubConsolOutputDeviceToSerial)
|
||||||
|
|
||||||
if 'gcs_destination' in manifest.provider:
|
if 'gcs_destination' in manifest.provider:
|
||||||
taskset.add(tasks.image.UploadImage)
|
taskset.add(image.UploadImage)
|
||||||
if 'gce_project' in manifest.provider:
|
if 'gce_project' in manifest.provider:
|
||||||
taskset.add(tasks.image.RegisterImage)
|
taskset.add(image.RegisterImage)
|
||||||
|
|
||||||
|
|
||||||
def resolve_rollback_tasks(taskset, manifest, completed, counter_task):
|
def resolve_rollback_tasks(taskset, manifest, completed, counter_task):
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
from bootstrapvz.common import task_groups
|
from bootstrapvz.common import task_groups
|
||||||
from . import tasks.packages
|
|
||||||
from . import tasks.boot
|
|
||||||
from bootstrapvz.common.tasks import image, loopback, initd, ssh, logicalvolume
|
from bootstrapvz.common.tasks import image, loopback, initd, ssh, logicalvolume
|
||||||
|
from .tasks import packages, boot
|
||||||
|
|
||||||
|
|
||||||
def validate_manifest(data, validator, error):
|
def validate_manifest(data, validator, error):
|
||||||
|
|
@ -12,7 +11,7 @@ def validate_manifest(data, validator, error):
|
||||||
def resolve_tasks(taskset, manifest):
|
def resolve_tasks(taskset, manifest):
|
||||||
taskset.update(task_groups.get_standard_groups(manifest))
|
taskset.update(task_groups.get_standard_groups(manifest))
|
||||||
|
|
||||||
taskset.update([tasks.packages.DefaultPackages,
|
taskset.update([packages.DefaultPackages,
|
||||||
initd.InstallInitScripts,
|
initd.InstallInitScripts,
|
||||||
ssh.AddOpenSSHPackage,
|
ssh.AddOpenSSHPackage,
|
||||||
ssh.ShredHostkeys,
|
ssh.ShredHostkeys,
|
||||||
|
|
@ -34,12 +33,12 @@ def resolve_tasks(taskset, manifest):
|
||||||
|
|
||||||
if manifest.provider.get('console', False):
|
if manifest.provider.get('console', False):
|
||||||
if manifest.provider['console'] == 'virtual':
|
if manifest.provider['console'] == 'virtual':
|
||||||
taskset.update([tasks.boot.SetGrubConsolOutputDeviceToVirtual])
|
taskset.update([boot.SetGrubConsolOutputDeviceToVirtual])
|
||||||
|
|
||||||
from bootstrapvz.common.releases import jessie
|
from bootstrapvz.common.releases import jessie
|
||||||
if manifest.release >= jessie:
|
if manifest.release >= jessie:
|
||||||
taskset.update([tasks.boot.SetGrubConsolOutputDeviceToVirtual,
|
taskset.update([boot.SetGrubConsolOutputDeviceToVirtual,
|
||||||
tasks.boot.SetSystemdTTYVTDisallocate,
|
boot.SetSystemdTTYVTDisallocate,
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,7 @@
|
||||||
|
import bootstrapvz.common.tasks.image
|
||||||
from bootstrapvz.common import task_groups
|
from bootstrapvz.common import task_groups
|
||||||
from bootstrapvz.common.tasks import image, loopback, ssh, volume
|
from bootstrapvz.common.tasks import loopback, ssh, volume
|
||||||
from . import tasks.api
|
from .tasks import api, image, network, packages
|
||||||
from . import tasks.image
|
|
||||||
from . import tasks.network
|
|
||||||
from . import tasks.packages
|
|
||||||
|
|
||||||
|
|
||||||
def validate_manifest(data, validator, error):
|
def validate_manifest(data, validator, error):
|
||||||
|
|
@ -26,20 +24,20 @@ def resolve_tasks(taskset, manifest):
|
||||||
|
|
||||||
taskset.update([loopback.AddRequiredCommands,
|
taskset.update([loopback.AddRequiredCommands,
|
||||||
loopback.Create,
|
loopback.Create,
|
||||||
image.MoveImage,
|
bootstrapvz.common.tasks.image.MoveImage,
|
||||||
ssh.DisableRootLogin,
|
ssh.DisableRootLogin,
|
||||||
volume.Delete,
|
volume.Delete,
|
||||||
tasks.image.CreateImageTarball,
|
image.CreateImageTarball,
|
||||||
tasks.network.InstallDHCPCD,
|
network.InstallDHCPCD,
|
||||||
tasks.packages.DefaultPackages,
|
packages.DefaultPackages,
|
||||||
])
|
])
|
||||||
|
|
||||||
if 'credentials' in manifest.provider:
|
if 'credentials' in manifest.provider:
|
||||||
taskset.add(tasks.api.Connect)
|
taskset.add(api.Connect)
|
||||||
taskset.add(tasks.image.UploadImageTarball)
|
taskset.add(image.UploadImageTarball)
|
||||||
if manifest.provider.get('verify', False):
|
if manifest.provider.get('verify', False):
|
||||||
taskset.add(tasks.image.DownloadImageTarball)
|
taskset.add(image.DownloadImageTarball)
|
||||||
taskset.add(tasks.image.CompareImageTarballs)
|
taskset.add(image.CompareImageTarballs)
|
||||||
|
|
||||||
|
|
||||||
def resolve_rollback_tasks(taskset, manifest, completed, counter_task):
|
def resolve_rollback_tasks(taskset, manifest, completed, counter_task):
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,7 @@
|
||||||
from bootstrapvz.common import task_groups
|
from bootstrapvz.common import task_groups
|
||||||
from . import tasks.packages
|
|
||||||
from . import tasks.boot
|
|
||||||
from bootstrapvz.common.tasks import image
|
from bootstrapvz.common.tasks import image
|
||||||
from bootstrapvz.common.tasks import loopback
|
from bootstrapvz.common.tasks import loopback
|
||||||
|
from .tasks import packages, boot
|
||||||
|
|
||||||
|
|
||||||
def validate_manifest(data, validator, error):
|
def validate_manifest(data, validator, error):
|
||||||
|
|
@ -13,8 +12,8 @@ def validate_manifest(data, validator, error):
|
||||||
def resolve_tasks(taskset, manifest):
|
def resolve_tasks(taskset, manifest):
|
||||||
taskset.update(task_groups.get_standard_groups(manifest))
|
taskset.update(task_groups.get_standard_groups(manifest))
|
||||||
|
|
||||||
taskset.update([tasks.packages.DefaultPackages,
|
taskset.update([packages.DefaultPackages,
|
||||||
tasks.boot.AddVirtualConsoleGrubOutputDevice,
|
boot.AddVirtualConsoleGrubOutputDevice,
|
||||||
loopback.AddRequiredCommands,
|
loopback.AddRequiredCommands,
|
||||||
loopback.Create,
|
loopback.Create,
|
||||||
image.MoveImage,
|
image.MoveImage,
|
||||||
|
|
|
||||||
2
pylintrc
2
pylintrc
|
|
@ -27,7 +27,7 @@ load-plugins=
|
||||||
# Enable the message, report, category or checker with the given id(s). You can
|
# Enable the message, report, category or checker with the given id(s). You can
|
||||||
# either give multiple identifier separated by comma (,) or put this option
|
# either give multiple identifier separated by comma (,) or put this option
|
||||||
# multiple time.
|
# multiple time.
|
||||||
enable=W0401,W0611
|
enable=W0401,W0403,W0611
|
||||||
|
|
||||||
# Disable the message, report, category or checker with the given id(s). You
|
# Disable the message, report, category or checker with the given id(s). You
|
||||||
# can either give multiple identifier separated by comma (,) or put this option
|
# can either give multiple identifier separated by comma (,) or put this option
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue