diff options
| author | Ben Howard <ben.howard@canonical.com> | 2014-01-17 08:27:09 -0700 |
|---|---|---|
| committer | Ben Howard <ben.howard@canonical.com> | 2014-01-17 08:27:09 -0700 |
| commit | 91d15b934b655fc56af416309ee020caac24ca3f (patch) | |
| tree | dd5e25e073fa4b362950de6f40d2629332b9d714 /cloudinit/stages.py | |
| parent | 13d9bf99ee49e2b72cfe63ee9d90c231890e292a (diff) | |
| download | vyos-cloud-init-91d15b934b655fc56af416309ee020caac24ca3f.tar.gz vyos-cloud-init-91d15b934b655fc56af416309ee020caac24ca3f.zip | |
pep8 and pylint fixes; typo fix for documentation
Diffstat (limited to 'cloudinit/stages.py')
| -rw-r--r-- | cloudinit/stages.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/cloudinit/stages.py b/cloudinit/stages.py index 5dced998..8ae0bc0d 100644 --- a/cloudinit/stages.py +++ b/cloudinit/stages.py @@ -26,8 +26,7 @@ import copy import os import sys -from cloudinit.settings import (PER_ALWAYS, PER_INSTANCE, FREQUENCIES, - CLOUD_CONFIG) +from cloudinit.settings import (PER_INSTANCE, FREQUENCIES, CLOUD_CONFIG) from cloudinit import handlers @@ -510,13 +509,13 @@ class Init(object): vdcfg = {'enabled': False} LOG.warn("invalid 'vendor_data' setting. resetting to: %s", vdcfg) - if not util.is_true(vdcfg.get('enabled')): - LOG.debug("vendordata consumption is disabled.") - return - enabled = vdcfg.get('enabled') no_handlers = vdcfg.get('disabled_handlers', None) + if not util.is_true(enabled): + LOG.debug("vendordata consumption is disabled.") + return + LOG.debug("vendor data will be consumed. disabled_handlers=%s", no_handlers) |