cloud-init-dev team mailing list archive

[Chad Smith <chad.smith@xxxxxxxxxxxxx>]

Diff comments:

> diff --git a/cloudinit/config/cc_ntp.py b/cloudinit/config/cc_ntp.py
> index cbd0237..a6f8a1d 100644
> --- a/cloudinit/config/cc_ntp.py
> +++ b/cloudinit/config/cc_ntp.py
> @@ -21,9 +23,80 @@ LOG = logging.getLogger(__name__)
>  
>  frequency = PER_INSTANCE
>  NTP_CONF = '/etc/ntp.conf'
> -TIMESYNCD_CONF = '/etc/systemd/timesyncd.conf.d/cloud-init.conf'
>  NR_POOL_SERVERS = 4
> -distros = ['centos', 'debian', 'fedora', 'opensuse', 'sles', 'ubuntu']
> +distros = ['centos', 'debian', 'fedora', 'opensuse', 'rhel', 'sles', 'ubuntu']
> +
> +NTP_CLIENT_CONFIG = {
> +    'chrony': {
> +        'check_exe': 'chronyd',
> +        'confpath': '/etc/chrony.conf',
> +        'packages': ['chrony'],
> +        'service_name': 'chrony',
> +        'template_name': 'chrony.conf.{distro}',
> +        'template': None,
> +    },
> +    'ntp': {
> +        'check_exe': 'ntpd',
> +        'confpath': NTP_CONF,
> +        'packages': ['ntp'],
> +        'service_name': 'ntp',
> +        'template_name': 'ntp.conf.{distro}',
> +        'template': None,
> +    },
> +    'ntpdate': {
> +        'check_exe': 'ntpdate',
> +        'confpath': NTP_CONF,
> +        'packages': ['ntpdate'],
> +        'service_name': 'ntpdate',
> +        'template_name': 'ntp.conf.{distro}',
> +        'template': None,
> +    },
> +    'systemd-timesyncd': {
> +        'check_exe': '/lib/systemd/systemd-timesyncd',
> +        'confpath': '/etc/systemd/timesyncd.conf.d/cloud-init.conf',
> +        'packages': [],
> +        'service_name': 'systemd-timesyncd',
> +        'template_name': 'timesyncd.conf',
> +        'template': None,
> +    },
> +}
> +
> +DISTRO_CLIENT_CONFIG = {

can we add a header comment here stating that this is just specific distribution overrides for configuration values.

> +    'debian': {
> +        'chrony': {
> +            'confpath': '/etc/chrony/chrony.conf',
> +        },
> +    },
> +    'opensuse': {
> +        'chrony': {
> +            'service_name': 'chronyd',
> +        },
> +        'ntp': {
> +            'confpath': '/etc/ntp.conf',
> +            'service_name': 'ntpd',
> +        },
> +        'systemd-timesyncd': {
> +            'check_exe': '/usr/lib/systemd/systemd-timesyncd',
> +        },
> +    },
> +    'sles': {
> +        'chrony': {
> +            'service_name': 'chronyd',
> +        },
> +        'ntp': {
> +            'confpath': '/etc/ntp.conf',
> +            'service_name': 'ntpd',
> +        },
> +        'systemd-timesyncd': {
> +            'check_exe': '/usr/lib/systemd/systemd-timesyncd',
> +        },
> +    },
> +    'ubuntu': {
> +        'chrony': {
> +            'confpath': '/etc/chrony/chrony.conf',
> +        },
> +    },
> +}
>  
>  
>  # The schema definition for each cloud-config module is a strict contract for


-- 
https://code.launchpad.net/~raharper/cloud-init/+git/cloud-init/+merge/339438
Your team cloud-init commiters is requested to review the proposed merge of ~raharper/cloud-init:feature/update-ntp-spec into cloud-init:master.