diff options
| author | Aleksander Baranowski <aleksander.baranowski@yahoo.pl> | 2021-08-05 18:32:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-05 11:32:36 -0500 |
| commit | 3d9c862b6ded798031fad827328fa437bc14ac97 (patch) | |
| tree | 8de4fae6a64e05f95329baaf51dd384a6baf59d3 /cloudinit/config | |
| parent | 758acf976f2cb67a85411467fa5fca2ea17a2283 (diff) | |
| download | vyos-cloud-init-3d9c862b6ded798031fad827328fa437bc14ac97.tar.gz vyos-cloud-init-3d9c862b6ded798031fad827328fa437bc14ac97.zip | |
Add support for EuroLinux 7 && EuroLinux 8 (#957)
Diffstat (limited to 'cloudinit/config')
| -rw-r--r-- | cloudinit/config/cc_ntp.py | 9 | ||||
| -rw-r--r-- | cloudinit/config/cc_yum_add_repo.py | 8 |
2 files changed, 9 insertions, 8 deletions
diff --git a/cloudinit/config/cc_ntp.py b/cloudinit/config/cc_ntp.py index d227efb9..7c371a49 100644 --- a/cloudinit/config/cc_ntp.py +++ b/cloudinit/config/cc_ntp.py @@ -24,8 +24,9 @@ LOG = logging.getLogger(__name__) frequency = PER_INSTANCE NTP_CONF = '/etc/ntp.conf' NR_POOL_SERVERS = 4 -distros = ['almalinux', 'alpine', 'centos', 'debian', 'fedora', 'opensuse', - 'photon', 'rhel', 'rocky', 'sles', 'ubuntu', 'virtuozzo'] +distros = ['almalinux', 'alpine', 'centos', 'debian', 'eurolinux', 'fedora', + 'opensuse', 'photon', 'rhel', 'rocky', 'sles', 'ubuntu', + 'virtuozzo'] NTP_CLIENT_CONFIG = { 'chrony': { @@ -405,9 +406,9 @@ def generate_server_names(distro): # For legal reasons x.pool.sles.ntp.org does not exist, # use the opensuse pool pool_distro = 'opensuse' - elif distro == 'alpine': + elif distro == 'alpine' or distro == 'eurolinux': # Alpine-specific pool (i.e. x.alpine.pool.ntp.org) does not exist - # so use general x.pool.ntp.org instead. + # so use general x.pool.ntp.org instead. The same applies to EuroLinux pool_distro = '' for x in range(0, NR_POOL_SERVERS): diff --git a/cloudinit/config/cc_yum_add_repo.py b/cloudinit/config/cc_yum_add_repo.py index 6e6133d1..b7a48dcc 100644 --- a/cloudinit/config/cc_yum_add_repo.py +++ b/cloudinit/config/cc_yum_add_repo.py @@ -18,8 +18,8 @@ entry, the config entry will be skipped. **Module frequency:** per always -**Supported distros:** almalinux, centos, fedora, photon, rhel, rocky, - virtuozzo +**Supported distros:** almalinux, centos, eurolinux, fedora, photon, rhel, + rocky, virtuozzo **Config keys**:: @@ -37,8 +37,8 @@ from configparser import ConfigParser from cloudinit import util -distros = ['almalinux', 'centos', 'fedora', 'photon', 'rhel', 'rocky', - 'virtuozzo'] +distros = ['almalinux', 'centos', 'eurolinux', 'fedora', 'photon', 'rhel', + 'rocky', 'virtuozzo'] def _canonicalize_id(repo_id): |