kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-24 15:36:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix PEP8 errors

Browse source
This commit is contained in:
Anders Ingemann 2014-04-10 00:27:37 +02:00
parent 3b23ccf92c
commit 69a76f2597
7 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -26,10 +26,10 @@ class AddDefaultSources(Task):
sections = 'main' sections = 'main'
if 'sections' in info.manifest.system: if 'sections' in info.manifest.system:
sections = ' '.join(info.manifest.system['sections']) sections = ' '.join(info.manifest.system['sections'])
info.source_lists.add('main', 'deb {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) info.source_lists.add('main', 'deb-src {apt_mirror} {system.release} ' + sections)
info.source_lists.add('main', 'deb 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-src http://security.debian.org/ {system.release}/updates ' + sections)
if info.manifest.system['release'] not in {'testing', 'unstable'}: if info.manifest.system['release'] not in {'testing', 'unstable'}:
info.source_lists.add('main', 'deb {apt_mirror} {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) info.source_lists.add('main', 'deb-src {apt_mirror} {system.release}-updates ' + sections)

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

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

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

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

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

@ -18,6 +18,7 @@ class AddBackports(Task):
info.source_lists.add('backports', 'deb {apt_mirror} {system.release}-backports main') 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') info.source_lists.add('backports', 'deb-src {apt_mirror} {system.release}-backports main')
class AddONEContextPackage(Task): class AddONEContextPackage(Task):
description = 'Adding the OpenNebula context package' description = 'Adding the OpenNebula context package'
phase = phases.preparation phase = phases.preparation

3
bootstrapvz/providers/azure/__init__.py
View file

@ -51,8 +51,7 @@ def resolve_tasks(tasklist, manifest):
tasks.boot.ConfigureGrub, tasks.boot.ConfigureGrub,
cleanup.ClearMOTD, cleanup.ClearMOTD,
cleanup.CleanTMP, cleanup.CleanTMP,
tasks.image.ConvertToVhd,
tasks.image.ConvertToVhd
]) ])
if manifest.bootstrapper.get('tarball', False): if manifest.bootstrapper.get('tarball', False):

3
bootstrapvz/providers/azure/tasks/packages.py
View file

@ -20,6 +20,7 @@ class DefaultPackages(Task):
info.packages.add('python-pyasn1') info.packages.add('python-pyasn1')
info.packages.add('sudo') info.packages.add('sudo')
class Waagent(Task): class Waagent(Task):
description = 'Add waagent' description = 'Add waagent'
phase = phases.package_installation phase = phases.package_installation
@ -43,4 +44,4 @@ class Waagent(Task):
if info.manifest.system['waagent'].get('conf', False): if info.manifest.system['waagent'].get('conf', False):
if os.path.isfile(info.manifest.system['waagent']['conf']): if os.path.isfile(info.manifest.system['waagent']['conf']):
log_check_call(['cp', info.manifest.system['waagent']['conf'], log_check_call(['cp', info.manifest.system['waagent']['conf'],
os.path.join(info.root,'etc/waagent.conf')]) os.path.join(info.root, 'etc/waagent.conf')])

19
docs/conf.py
View file

@ -186,7 +186,7 @@ htmlhelp_basename = 'bootstrap-vzdoc'
# -- Options for LaTeX output --------------------------------------------- # -- Options for LaTeX output ---------------------------------------------
latex_elements = { latex_elements = {}
# The paper size ('letterpaper' or 'a4paper'). # The paper size ('letterpaper' or 'a4paper').
#'papersize': 'letterpaper', #'papersize': 'letterpaper',
@ -195,15 +195,13 @@ latex_elements = {
# Additional stuff for the LaTeX preamble. # Additional stuff for the LaTeX preamble.
#'preamble': '', #'preamble': '',
}
# Grouping the document tree into LaTeX files. List of tuples # Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title, # (source start file, target name, title,
# author, documentclass [howto, manual, or own class]). # author, documentclass [howto, manual, or own class]).
latex_documents = [ latex_documents = [('index', 'bootstrap-vz.tex', u'bootstrap-vz Documentation',
('index', 'bootstrap-vz.tex', u'bootstrap-vz Documentation', u'Anders Ingemann', 'manual'),
u'Anders Ingemann', 'manual'), ]
]
# The name of an image file (relative to this directory) to place at the top of # The name of an image file (relative to this directory) to place at the top of
# the title page. # the title page.
@ -244,11 +242,10 @@ man_pages = [
# Grouping the document tree into Texinfo files. List of tuples # Grouping the document tree into Texinfo files. List of tuples
# (source start file, target name, title, author, # (source start file, target name, title, author,
# dir menu entry, description, category) # dir menu entry, description, category)
texinfo_documents = [ texinfo_documents = [('index', 'bootstrap-vz', u'bootstrap-vz Documentation',
('index', 'bootstrap-vz', u'bootstrap-vz Documentation', u'Anders Ingemann', 'bootstrap-vz', 'One line description of project.',
u'Anders Ingemann', 'bootstrap-vz', 'One line description of project.', 'Miscellaneous'),
'Miscellaneous'), ]
]
# Documents to append as an appendix to all manuals. # Documents to append as an appendix to all manuals.
#texinfo_appendices = [] #texinfo_appendices = []