diff options
Diffstat (limited to 'cloudinit/config/cc_resolv_conf.py')
| -rw-r--r-- | cloudinit/config/cc_resolv_conf.py | 41 |
1 files changed, 24 insertions, 17 deletions
diff --git a/cloudinit/config/cc_resolv_conf.py b/cloudinit/config/cc_resolv_conf.py index 648935e4..b2970d51 100644 --- a/cloudinit/config/cc_resolv_conf.py +++ b/cloudinit/config/cc_resolv_conf.py @@ -47,19 +47,18 @@ are configured correctly. """ from cloudinit import log as logging -from cloudinit import templater +from cloudinit import templater, util from cloudinit.settings import PER_INSTANCE -from cloudinit import util LOG = logging.getLogger(__name__) frequency = PER_INSTANCE -distros = ['alpine', 'fedora', 'opensuse', 'photon', 'rhel', 'sles'] +distros = ["alpine", "fedora", "opensuse", "photon", "rhel", "sles"] RESOLVE_CONFIG_TEMPLATE_MAP = { - '/etc/resolv.conf': 'resolv.conf', - '/etc/systemd/resolved.conf': 'systemd.resolved.conf', + "/etc/resolv.conf": "resolv.conf", + "/etc/systemd/resolved.conf": "systemd.resolved.conf", } @@ -67,8 +66,8 @@ def generate_resolv_conf(template_fn, params, target_fname): flags = [] false_flags = [] - if 'options' in params: - for key, val in params['options'].items(): + if "options" in params: + for key, val in params["options"].items(): if isinstance(val, bool): if val: flags.append(key) @@ -76,12 +75,12 @@ def generate_resolv_conf(template_fn, params, target_fname): false_flags.append(key) for flag in flags + false_flags: - del params['options'][flag] + del params["options"][flag] - if not params.get('options'): - params['options'] = {} + if not params.get("options"): + params["options"] = {} - params['flags'] = flags + params["flags"] = flags LOG.debug("Writing resolv.conf from template %s", template_fn) templater.render_to_file(template_fn, target_fname, params) @@ -97,13 +96,19 @@ def handle(name, cfg, cloud, log, _args): @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) + log.debug( + "Skipping module named %s," + " no 'manage_resolv_conf' key in configuration", + name, + ) return if not util.get_cfg_option_bool(cfg, "manage_resolv_conf", False): - log.debug(("Skipping module named %s," - " 'manage_resolv_conf' present but set to False"), name) + log.debug( + "Skipping module named %s," + " 'manage_resolv_conf' present but set to False", + name, + ) return if "resolv_conf" not in cfg: @@ -112,7 +117,8 @@ def handle(name, cfg, cloud, log, _args): try: template_fn = cloud.get_template_filename( - RESOLVE_CONFIG_TEMPLATE_MAP[cloud.distro.resolve_conf_fn]) + RESOLVE_CONFIG_TEMPLATE_MAP[cloud.distro.resolve_conf_fn] + ) except KeyError: log.warning("No template found, not rendering resolve configs") return @@ -120,8 +126,9 @@ def handle(name, cfg, cloud, log, _args): generate_resolv_conf( template_fn=template_fn, params=cfg["resolv_conf"], - target_fname=cloud.distro.resolve_conf_fn + target_fname=cloud.distro.resolve_conf_fn, ) return + # vi: ts=4 expandtab |