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 style fixes

Browse source
This commit is contained in:
Anders Ingemann 2013-12-14 19:37:23 +01:00
parent 3ee0c314d6
commit 293557827f
7 changed files with 63 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
base/fs/partitionmaps/abstract.py
View file

@ -50,12 +50,12 @@ class AbstractPartitionMap(FSMProxy):
if match is None: if match is None:
raise PartitionError('Unable to parse kpartx output: {line}'.format(line=mapping)) raise PartitionError('Unable to parse kpartx output: {line}'.format(line=mapping))
partition_path = os.path.join('/dev/mapper', match.group('name')) partition_path = os.path.join('/dev/mapper', match.group('name'))
p_idx = int(match.group('p_idx'))-1 p_idx = int(match.group('p_idx')) - 1
self.partitions[p_idx].map(partition_path) self.partitions[p_idx].map(partition_path)
for idx, partition in enumerate(self.partitions): for idx, partition in enumerate(self.partitions):
if partition.fsm.current not in ['mapped', 'formatted']: if partition.fsm.current not in ['mapped', 'formatted']:
raise PartitionError('kpartx did not map partition #{idx}'.format(idx=idx+1)) raise PartitionError('kpartx did not map partition #{idx}'.format(idx=idx + 1))
except PartitionError as e: except PartitionError as e:
for partition in self.partitions: for partition in self.partitions:

2
base/fs/partitions/base.py
View file

@ -25,7 +25,7 @@ class BasePartition(AbstractPartition):
if self.previous is None: if self.previous is None:
return 1 return 1
else: else:
return self.previous.get_index()+1 return self.previous.get_index() + 1
def get_start(self): def get_start(self):
if self.previous is None: if self.previous is None:

2
common/fs/loopbackvolume.py
View file

@ -35,7 +35,7 @@ class LoopbackVolume(Volume):
loop_device_name = os.path.basename(self.loop_device_path) loop_device_name = os.path.basename(self.loop_device_path)
loop_device_partition = proc_partitions[loop_device_name] loop_device_partition = proc_partitions[loop_device_name]
sectors = self.size*1024*1024/512 sectors = self.size * 1024 * 1024 / 512
table = ('{log_start_sec} {sectors} linear {major}:{minor} {start_sec}' table = ('{log_start_sec} {sectors} linear {major}:{minor} {start_sec}'
.format(log_start_sec=0, .format(log_start_sec=0,
sectors=sectors, sectors=sectors,

2
common/tasks/boot.py
View file

@ -75,7 +75,7 @@ class InstallGrub(Task):
device_map.write('(hd0,{prefix}{idx}) {device_path}\n' device_map.write('(hd0,{prefix}{idx}) {device_path}\n'
.format(device_path=partition.device_path, .format(device_path=partition.device_path,
prefix=partition_prefix, prefix=partition_prefix,
idx=idx+1)) idx=idx + 1))
# Install grub # Install grub
log_check_call(['/usr/sbin/chroot', info.root, log_check_call(['/usr/sbin/chroot', info.root,

111
providers/ec2/tasks/ami.py
View file

@ -95,60 +95,61 @@ class RegisterAMI(Task):
predecessors = [Snapshot, UploadImage] predecessors = [Snapshot, UploadImage]
# Source: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/UserProvidedKernels.html#AmazonKernelImageIDs # Source: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/UserProvidedKernels.html#AmazonKernelImageIDs
kernel_mapping = {'ap-northeast-1': { # Asia Pacific (Tokyo) Region kernel_mapping = {'ap-northeast-1': # Asia Pacific (Tokyo) Region
'hd0': {'i386': 'aki-136bf512', # pv-grub-hd0_1.04-i386.gz {'hd0': {'i386': 'aki-136bf512', # pv-grub-hd0_1.04-i386.gz
'amd64': 'aki-176bf516'}, # pv-grub-hd0_1.04-x86_64.gz 'amd64': 'aki-176bf516'}, # pv-grub-hd0_1.04-x86_64.gz
'hd00': {'i386': 'aki-196bf518', # pv-grub-hd00_1.04-i386.gz 'hd00': {'i386': 'aki-196bf518', # pv-grub-hd00_1.04-i386.gz
'amd64': 'aki-1f6bf51e'} # pv-grub-hd00_1.04-x86_64.gz 'amd64': 'aki-1f6bf51e'} # pv-grub-hd00_1.04-x86_64.gz
}, },
'ap-southeast-1': { # Asia Pacific (Singapore) Region 'ap-southeast-1': # Asia Pacific (Singapore) Region
'hd0': {'i386': 'aki-ae3973fc', # pv-grub-hd0_1.04-i386.gz {'hd0': {'i386': 'aki-ae3973fc', # pv-grub-hd0_1.04-i386.gz
'amd64': 'aki-503e7402'}, # pv-grub-hd0_1.04-x86_64.gz 'amd64': 'aki-503e7402'}, # pv-grub-hd0_1.04-x86_64.gz
'hd00': {'i386': 'aki-563e7404', # pv-grub-hd00_1.04-i386.gz 'hd00': {'i386': 'aki-563e7404', # pv-grub-hd00_1.04-i386.gz
'amd64': 'aki-5e3e740c'} # pv-grub-hd00_1.04-x86_64.gz 'amd64': 'aki-5e3e740c'} # pv-grub-hd00_1.04-x86_64.gz
}, },
'ap-southeast-2': { # Asia Pacific (Sydney) Region 'ap-southeast-2': # Asia Pacific (Sydney) Region
'hd0': {'i386': 'aki-cd62fff7', # pv-grub-hd0_1.04-i386.gz {'hd0': {'i386': 'aki-cd62fff7', # pv-grub-hd0_1.04-i386.gz
'amd64': 'aki-c362fff9'}, # pv-grub-hd0_1.04-x86_64.gz 'amd64': 'aki-c362fff9'}, # pv-grub-hd0_1.04-x86_64.gz
'hd00': {'i386': 'aki-c162fffb', # pv-grub-hd00_1.04-i386.gz 'hd00': {'i386': 'aki-c162fffb', # pv-grub-hd00_1.04-i386.gz
'amd64': 'aki-3b1d8001'} # pv-grub-hd00_1.04-x86_64.gz 'amd64': 'aki-3b1d8001'} # pv-grub-hd00_1.04-x86_64.gz
}, },
'eu-west-1': { # EU (Ireland) Region 'eu-west-1': # EU (Ireland) Region
'hd0': {'i386': 'aki-68a3451f', # pv-grub-hd0_1.04-i386.gz {'hd0': {'i386': 'aki-68a3451f', # pv-grub-hd0_1.04-i386.gz
'amd64': 'aki-52a34525'}, # pv-grub-hd0_1.04-x86_64.gz 'amd64': 'aki-52a34525'}, # pv-grub-hd0_1.04-x86_64.gz
'hd00': {'i386': 'aki-5ea34529', # pv-grub-hd00_1.04-i386.gz 'hd00': {'i386': 'aki-5ea34529', # pv-grub-hd00_1.04-i386.gz
'amd64': 'aki-58a3452f'} # pv-grub-hd00_1.04-x86_64.gz 'amd64': 'aki-58a3452f'} # pv-grub-hd00_1.04-x86_64.gz
}, },
'sa-east-1': { # South America (Sao Paulo) Region 'sa-east-1': # South America (Sao Paulo) Region
'hd0': {'i386': 'aki-5b53f446', # pv-grub-hd0_1.04-i386.gz {'hd0': {'i386': 'aki-5b53f446', # pv-grub-hd0_1.04-i386.gz
'amd64': 'aki-5553f448'}, # pv-grub-hd0_1.04-x86_64.gz 'amd64': 'aki-5553f448'}, # pv-grub-hd0_1.04-x86_64.gz
'hd00': {'i386': 'aki-5753f44a', # pv-grub-hd00_1.04-i386.gz 'hd00': {'i386': 'aki-5753f44a', # pv-grub-hd00_1.04-i386.gz
'amd64': 'aki-5153f44c'} # pv-grub-hd00_1.04-x86_64.gz 'amd64': 'aki-5153f44c'} # pv-grub-hd00_1.04-x86_64.gz
}, },
'us-east-1': { # US East (Northern Virginia) Region 'us-east-1': # US East (Northern Virginia) Region
'hd0': {'i386': 'aki-8f9dcae6', # pv-grub-hd0_1.04-i386.gz {'hd0': {'i386': 'aki-8f9dcae6', # pv-grub-hd0_1.04-i386.gz
'amd64': 'aki-919dcaf8'}, # pv-grub-hd0_1.04-x86_64.gz 'amd64': 'aki-919dcaf8'}, # pv-grub-hd0_1.04-x86_64.gz
'hd00': {'i386': 'aki-659ccb0c', # pv-grub-hd00_1.04-i386.gz 'hd00': {'i386': 'aki-659ccb0c', # pv-grub-hd00_1.04-i386.gz
'amd64': 'aki-499ccb20'} # pv-grub-hd00_1.04-x86_64.gz 'amd64': 'aki-499ccb20'} # pv-grub-hd00_1.04-x86_64.gz
}, },
'us-gov-west-1': { # AWS GovCloud (US) 'us-gov-west-1': # AWS GovCloud (US)
'hd0': {'i386': 'aki-1fe98d3c', # pv-grub-hd0_1.04-i386.gz {'hd0': {'i386': 'aki-1fe98d3c', # pv-grub-hd0_1.04-i386.gz
'amd64': 'aki-1de98d3e'}, # pv-grub-hd0_1.04-x86_64.gz 'amd64': 'aki-1de98d3e'}, # pv-grub-hd0_1.04-x86_64.gz
'hd00': {'i386': 'aki-63e98d40', # pv-grub-hd00_1.04-i386.gz 'hd00': {'i386': 'aki-63e98d40', # pv-grub-hd00_1.04-i386.gz
'amd64': 'aki-61e98d42'} # pv-grub-hd00_1.04-x86_64.gz 'amd64': 'aki-61e98d42'} # pv-grub-hd00_1.04-x86_64.gz
}, },
'us-west-1': { # US West (Northern California) Region 'us-west-1': # US West (Northern California) Region
'hd0': {'i386': 'aki-8e0531cb', # pv-grub-hd0_1.04-i386.gz {'hd0': {'i386': 'aki-8e0531cb', # pv-grub-hd0_1.04-i386.gz
'amd64': 'aki-880531cd'}, # pv-grub-hd0_1.04-x86_64.gz 'amd64': 'aki-880531cd'}, # pv-grub-hd0_1.04-x86_64.gz
'hd00': {'i386': 'aki-960531d3', # pv-grub-hd00_1.04-i386.gz 'hd00': {'i386': 'aki-960531d3', # pv-grub-hd00_1.04-i386.gz
'amd64': 'aki-920531d7'} # pv-grub-hd00_1.04-x86_64.gz 'amd64': 'aki-920531d7'} # pv-grub-hd00_1.04-x86_64.gz
}, },
'us-west-2': { # US West (Oregon) Region 'us-west-2': # US West (Oregon) Region
'hd0': {'i386': 'aki-f08f11c0', # pv-grub-hd0_1.04-i386.gz {'hd0': {'i386': 'aki-f08f11c0', # pv-grub-hd0_1.04-i386.gz
'amd64': 'aki-fc8f11cc'}, # pv-grub-hd0_1.04-x86_64.gz 'amd64': 'aki-fc8f11cc'}, # pv-grub-hd0_1.04-x86_64.gz
'hd00': {'i386': 'aki-e28f11d2', # pv-grub-hd00_1.04-i386.gz 'hd00': {'i386': 'aki-e28f11d2', # pv-grub-hd00_1.04-i386.gz
'amd64': 'aki-e68f11d6'} # pv-grub-hd00_1.04-x86_64.gz 'amd64': 'aki-e68f11d6'} # pv-grub-hd00_1.04-x86_64.gz
}} }
}
def run(self, info): def run(self, info):
registration_params = {'name': info.ami_name, registration_params = {'name': info.ami_name,
@ -169,7 +170,7 @@ class RegisterAMI(Task):
from boto.ec2.blockdevicemapping import BlockDeviceType from boto.ec2.blockdevicemapping import BlockDeviceType
from boto.ec2.blockdevicemapping import BlockDeviceMapping from boto.ec2.blockdevicemapping import BlockDeviceMapping
block_device = BlockDeviceType(snapshot_id=info.snapshot.id, delete_on_termination=True, block_device = BlockDeviceType(snapshot_id=info.snapshot.id, delete_on_termination=True,
size=info.volume.partition_map.get_total_size()/1024) size=info.volume.partition_map.get_total_size() / 1024)
registration_params['block_device_map'] = BlockDeviceMapping() registration_params['block_device_map'] = BlockDeviceMapping()
registration_params['block_device_map']['/dev/sda'] = block_device registration_params['block_device_map']['/dev/sda'] = block_device

2
providers/ec2/tasks/boot.py
View file

@ -30,7 +30,7 @@ class ConfigurePVGrub(Task):
root_idx = info.volume.partition_map.root.get_index() root_idx = info.volume.partition_map.root.get_index()
grub_device = 'GRUB_DEVICE=/dev/xvda{idx}'.format(idx=root_idx) grub_device = 'GRUB_DEVICE=/dev/xvda{idx}'.format(idx=root_idx)
sed_i(script_dst, '^GRUB_DEVICE=/dev/xvda$', grub_device) sed_i(script_dst, '^GRUB_DEVICE=/dev/xvda$', grub_device)
grub_root = '\troot (hd0,{idx})'.format(idx=root_idx-1) grub_root = '\troot (hd0,{idx})'.format(idx=root_idx - 1)
sed_i(script_dst, '^\troot \(hd0\)$', grub_root) sed_i(script_dst, '^\troot \(hd0\)$', grub_root)
if info.manifest.volume['backing'] == 's3': if info.manifest.volume['backing'] == 's3':

2
providers/ec2/tasks/connection.py
View file

@ -22,7 +22,7 @@ class GetCredentials(Task):
return creds return creds
def env_key(key): def env_key(key):
return ('aws-'+key).upper().replace('-', '_') return ('aws-' + key).upper().replace('-', '_')
if all(getenv(env_key(key)) is not None for key in keys): if all(getenv(env_key(key)) is not None for key in keys):
for key in keys: for key in keys:
creds[key] = getenv(env_key(key)) creds[key] = getenv(env_key(key))