diff options
| author | Scott Moser <smoser@brickies.net> | 2017-04-27 12:50:12 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-04-27 12:50:12 -0400 |
| commit | 8310484a880690529a4936615df596d467e51708 (patch) | |
| tree | 886aeb1a6e3ca809e466ddbcacbe9741b56dafa0 /cloudinit/config/cc_mounts.py | |
| parent | af63cf763946bca6163dc797195a3aeae975f8da (diff) | |
| parent | 513e99e049eab4acea14e187f59d760adc755b40 (diff) | |
| download | vyos-cloud-init-8310484a880690529a4936615df596d467e51708.tar.gz vyos-cloud-init-8310484a880690529a4936615df596d467e51708.zip | |
merge from 513e99e049ea at 0.7.9-113-g513e99e0
Diffstat (limited to 'cloudinit/config/cc_mounts.py')
| -rw-r--r-- | cloudinit/config/cc_mounts.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/cloudinit/config/cc_mounts.py b/cloudinit/config/cc_mounts.py index 5b630f8b..f14a4fc5 100644 --- a/cloudinit/config/cc_mounts.py +++ b/cloudinit/config/cc_mounts.py @@ -216,8 +216,9 @@ def suggested_swapsize(memsize=None, maxsize=None, fsys=None): else: pinfo[k] = v - LOG.debug("suggest %(size)s swap for %(mem)s memory with '%(avail)s'" - " disk given max=%(max_in)s [max=%(max)s]'" % pinfo) + LOG.debug("suggest %s swap for %s memory with '%s'" + " disk given max=%s [max=%s]'", pinfo['size'], pinfo['mem'], + pinfo['avail'], pinfo['max_in'], pinfo['max']) return size @@ -266,7 +267,7 @@ def handle_swapcfg(swapcfg): return None or (filename, size) """ if not isinstance(swapcfg, dict): - LOG.warn("input for swap config was not a dict.") + LOG.warning("input for swap config was not a dict.") return None fname = swapcfg.get('filename', '/swap.img') @@ -289,7 +290,8 @@ def handle_swapcfg(swapcfg): return fname LOG.debug("swap file %s existed, but not in /proc/swaps", fname) except Exception: - LOG.warn("swap file %s existed. Error reading /proc/swaps", fname) + LOG.warning("swap file %s existed. Error reading /proc/swaps", + fname) return fname try: @@ -300,7 +302,7 @@ def handle_swapcfg(swapcfg): return setup_swapfile(fname=fname, size=size, maxsize=maxsize) except Exception as e: - LOG.warn("failed to setup swap: %s", e) + LOG.warning("failed to setup swap: %s", e) return None |