x/cloud-init
Code Issues Proposed changes

Cleanups around the usage of the apt pipe line value.

Browse Source 
1. Add a comment onto why this is done
2. Fix the usage of range to search the list and not a string
3. Make the filecontents template just one multiline variable.
This commit is contained in:
Joshua Harlow 2012-06-16 07:39:56 -07:00
parent 85e7f52f99
commit 68b6d78614
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cloudinit/transforms/cc_apt_pipelining.py
View File

@ -25,31 +25,35 @@ distros = ['ubuntu', 'debian']
default_file = "/etc/apt/apt.conf.d/90cloud-init-pipelining" default_file = "/etc/apt/apt.conf.d/90cloud-init-pipelining"
# Acquire::http::Pipeline-Depth can be a value
# from 0 to 5 indicating how many outstanding requests APT should send.
# A value of zero MUST be specified if the remote host does not properly linger
# on TCP connections - otherwise data corruption will occur.
def handle(_name, cfg, _cloud, log, _args): def handle(_name, cfg, _cloud, log, _args):
apt_pipe_value = util.get_cfg_option_str(cfg, "apt_pipelining", False) apt_pipe_value = util.get_cfg_option_str(cfg, "apt_pipelining", False)
apt_pipe_value = str(apt_pipe_value).lower() apt_pipe_value_s = str(apt_pipe_value).lower().strip()
if apt_pipe_value == "false": if apt_pipe_value_s == "false":
write_apt_snippet("0", log) write_apt_snippet("0", log)
elif apt_pipe_value in ("none", "unchanged", "os"): elif apt_pipe_value_s in ("none", "unchanged", "os"):
return return
elif apt_pipe_value in str(range(0, 6)): elif apt_pipe_value_s in [str(b) for b in xrange(0, 6)]:
write_apt_snippet(apt_pipe_value, log) write_apt_snippet(apt_pipe_value_s, log)
else: else:
log.warn("Invalid option for apt_pipeling: %s" % apt_pipe_value) log.warn("Invalid option for apt_pipeling: %s", apt_pipe_value)
def write_apt_snippet(setting, log, f_name=default_file): def write_apt_snippet(setting, log, f_name=default_file):
""" Writes f_name with apt pipeline depth 'setting' """ """ Writes f_name with apt pipeline depth 'setting' """
acquire_pipeline_depth = 'Acquire::http::Pipeline-Depth "%s";\n'
file_contents = ("//Written by cloud-init per 'apt_pipelining'\n" file_contents = ("//Written by cloud-init per 'apt_pipelining'\n"
+ (acquire_pipeline_depth % setting)) 'Acquire::http::Pipeline-Depth "%s";\n') % (setting)
util.write_file(f_name, file_contents) util.write_file(f_name, file_contents)