summaryrefslogtreecommitdiff
path: root/cloudinit/config/cc_resolv_conf.py
diff options
context:
space:
mode:
authorNate House nathan.house@rackspace.com <>2014-02-04 16:09:09 -0600
committerNate House nathan.house@rackspace.com <>2014-02-04 16:09:09 -0600
commit6e0aaf44c7a869d35a962a2d60be2d833023d4ec (patch)
tree2cf2bf8727e389c53e25190becb2ba44ac2ffd9d /cloudinit/config/cc_resolv_conf.py
parent6922fc8294e38ee0780e9d74da7d3ec010a3cd3c (diff)
parent0efeb26736ddae2967c14a9440088594da32070d (diff)
downloadvyos-cloud-init-6e0aaf44c7a869d35a962a2d60be2d833023d4ec.tar.gz
vyos-cloud-init-6e0aaf44c7a869d35a962a2d60be2d833023d4ec.zip
Merge gentoo branch and updated set-password to support systemctl
Diffstat (limited to 'cloudinit/config/cc_resolv_conf.py')
-rw-r--r--cloudinit/config/cc_resolv_conf.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/cloudinit/config/cc_resolv_conf.py b/cloudinit/config/cc_resolv_conf.py
index 879b62b1..feacebcd 100644
--- a/cloudinit/config/cc_resolv_conf.py
+++ b/cloudinit/config/cc_resolv_conf.py
@@ -92,6 +92,7 @@ def handle(name, cfg, _cloud, log, _args):
@param log: Pre-initialized Python logger object to use for logging.
@param args: Any module arguments from cloud.cfg
"""
+
if "manage_resolv_conf" not in cfg:
log.debug(("Skipping module named %s,"
" no 'manage_resolv_conf' key in configuration"), name)