diff options
Diffstat (limited to 'cloudinit/config/cc_ntp.py')
| -rw-r--r-- | cloudinit/config/cc_ntp.py | 39 |
1 files changed, 37 insertions, 2 deletions
diff --git a/cloudinit/config/cc_ntp.py b/cloudinit/config/cc_ntp.py index 47659af7..8d834336 100644 --- a/cloudinit/config/cc_ntp.py +++ b/cloudinit/config/cc_ntp.py @@ -282,11 +282,24 @@ meta: MetaSchema = { {% for server in servers -%} server {{server}} iburst {% endfor %} + {% if peers -%}# peers{% endif %} + {% for peer in peers -%} + peer {{peer}} + {% endfor %} + {% if allow -%}# allow{% endif %} + {% for cidr in allow -%} + allow {{cidr}} + {% endfor %} pools: [0.int.pool.ntp.org, 1.int.pool.ntp.org, ntp.myorg.org] servers: - ntp.server.local - ntp.ubuntu.com - - 192.168.23.2""" + - 192.168.23.2 + allow: + - 192.168.23.0/32 + peers: + - km001 + - km002""" ), ], "frequency": PER_INSTANCE, @@ -425,6 +438,8 @@ def write_ntp_config_template( service_name=None, servers=None, pools=None, + allow=None, + peers=None, path=None, template_fn=None, template=None, @@ -437,6 +452,10 @@ def write_ntp_config_template( list. @param pools: A list of strings specifying ntp pools. Defaults to empty list. + @param allow: A list of strings specifying a network/CIDR. Defaults to + empty list. + @param peers: A list nodes that should peer with each other. Defaults to + empty list. @param path: A string to specify where to write the rendered template. @param template_fn: A string to specify the template source file. @param template: A string specifying the contents of the template. This @@ -450,6 +469,10 @@ def write_ntp_config_template( servers = [] if not pools: pools = [] + if not allow: + allow = [] + if not peers: + peers = [] if len(servers) == 0 and len(pools) == 0 and distro_name == "cos": return @@ -474,7 +497,12 @@ def write_ntp_config_template( if not template_fn and not template: raise ValueError("Not template_fn or template provided") - params = {"servers": servers, "pools": pools} + params = { + "servers": servers, + "pools": pools, + "allow": allow, + "peers": peers, + } if template: tfile = temp_utils.mkstemp(prefix="template_name-", suffix=".tmpl") template_fn = tfile[1] # filepath is second item in tuple @@ -596,11 +624,18 @@ def handle(name: str, cfg: Config, cloud: Cloud, args: list) -> None: ) raise RuntimeError(msg) + LOG.debug("service_name: %s", ntp_client_config.get("service_name")) + LOG.debug("servers: %s", ntp_cfg.get("servers", [])) + LOG.debug("pools: %s", ntp_cfg.get("pools", [])) + LOG.debug("allow: %s", ntp_cfg.get("allow", [])) + LOG.debug("peers: %s", ntp_cfg.get("peers", [])) write_ntp_config_template( cloud.distro.name, service_name=ntp_client_config.get("service_name"), servers=ntp_cfg.get("servers", []), pools=ntp_cfg.get("pools", []), + allow=ntp_cfg.get("allow", []), + peers=ntp_cfg.get("peers", []), path=ntp_client_config.get("confpath"), template_fn=template_fn, template=ntp_client_config.get("template"), |