diff options
| author | Louis Abel <nazunalika@users.noreply.github.com> | 2022-12-02 12:07:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-02 13:07:04 -0600 |
| commit | 5e6ecc615318b48e2b14c2fd1f78571522848b4e (patch) | |
| tree | 875b5057fc08857eb16f4c3842b2e18651069b83 /config | |
| parent | 7a93f1cad75715696227aa0893ff15156eaa7943 (diff) | |
| download | cloud-init-git-5e6ecc615318b48e2b14c2fd1f78571522848b4e.tar.gz | |
Append derivatives to is_rhel list in cloud.cfg.tmpl (#1887)
This commit adds Rocky Linux, AlmaLinux, CloudLinux, EuroLinux, Miracle
Linux, and Virtuozzo to the is_rhel list. Recent downstream patch from
Red Hat causes issues with RHEL derivatives with the cloud.cfg template,
which leads to derivatives having to make small changes to bring back
expected functionality.
Diffstat (limited to 'config')
| -rw-r--r-- | config/cloud.cfg.tmpl | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl index 0f234a7d..fdd5a357 100644 --- a/config/cloud.cfg.tmpl +++ b/config/cloud.cfg.tmpl @@ -3,7 +3,8 @@ # The top level settings are used as module # and base configuration. {% set is_bsd = variant in ["dragonfly", "freebsd", "netbsd", "openbsd"] %} -{% set is_rhel = variant in ["rhel", "centos"] %} +{% set is_rhel = variant in ["almalinux", "centos", "cloudlinux", "eurolinux", + "miraclelinux", "rhel", "rocky", "virtuozzo" ] %} {% if is_bsd %} syslog_fix_perms: root:wheel {% elif variant in ["suse"] %} @@ -34,8 +35,7 @@ disable_root: false disable_root: true {% endif %} -{% if variant in ["almalinux", "alpine", "amazon", "cloudlinux", "eurolinux", - "fedora", "miraclelinux", "openEuler", "openmandriva", "rocky", "virtuozzo"] or is_rhel %} +{% if variant in ["alpine", "amazon", "fedora", "openEuler", "openmandriva"] or is_rhel %} {% if is_rhel %} mount_default_fields: [~, ~, 'auto', 'defaults,nofail,x-systemd.requires=cloud-init.service,_netdev', '0', '2'] {% else %} @@ -197,9 +197,9 @@ cloud_final_modules: # (not accessible to handlers/transforms) system_info: # This will affect which distro class gets used -{% if variant in ["almalinux", "alpine", "amazon", "arch", "cloudlinux", "debian", - "eurolinux", "fedora", "freebsd", "gentoo", "netbsd", "mariner", "miraclelinux", "openbsd", "openEuler", - "openmandriva", "photon", "rocky", "suse", "ubuntu", "virtuozzo"] or is_rhel %} +{% if variant in ["alpine", "amazon", "arch", "debian", "fedora", "freebsd", + "gentoo", "netbsd", "mariner", "openbsd", "openEuler", + "openmandriva", "photon", "suse", "ubuntu"] or is_rhel %} distro: {{ variant }} {% elif variant in ["dragonfly"] %} distro: dragonflybsd @@ -252,15 +252,15 @@ system_info: primary: http://ports.ubuntu.com/ubuntu-ports security: http://ports.ubuntu.com/ubuntu-ports ssh_svcname: ssh -{% elif variant in ["almalinux", "alpine", "amazon", "arch", "cloudlinux", "eurolinux", - "fedora", "gentoo", "miraclelinux", "openEuler", "openmandriva", "rocky", "suse", "virtuozzo"] or is_rhel %} +{% elif variant in ["alpine", "amazon", "arch", "fedora", + "gentoo", "openEuler", "openmandriva", "suse"] or is_rhel %} # Default user name + that default users groups (if added/used) default_user: {% if variant == "amazon" %} name: ec2-user lock_passwd: True gecos: EC2 Default User -{% elif is_rhel %} +{% elif variant in ["rhel", "centos"] %} name: cloud-user lock_passwd: true gecos: Cloud User |