diff options
author | Emanuele Giuseppe Esposito <eesposit@redhat.com> | 2022-09-07 14:53:26 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-07 06:53:26 -0600 |
commit | 7593243a1abe2ccaf4698579720999380a4da73b (patch) | |
tree | bdc333ec7758e15e8968b69ff198ae8ab30d7671 /config | |
parent | a72b26faf0a70732f612693ce8ccc837df42935e (diff) | |
download | cloud-init-git-7593243a1abe2ccaf4698579720999380a4da73b.tar.gz |
cloud.cfg.tmpl: make sure "centos" settings are identical to "rhel" (#1639)
We have a couple of bugs where centos does not have the default user as rhel.
This PR makes sure the configuration is exactly the same.
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
RHBZ: 2115565
RHBZ: 2115576
Diffstat (limited to 'config')
-rw-r--r-- | config/cloud.cfg.tmpl | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl index a6096f47..fa250a51 100644 --- a/config/cloud.cfg.tmpl +++ b/config/cloud.cfg.tmpl @@ -2,6 +2,7 @@ # The top level settings are used as module # and system configuration. {% set is_bsd = variant in ["dragonfly", "freebsd", "netbsd", "openbsd"] %} +{% set is_rhel = variant in ["rhel", "centos"] %} {% if is_bsd %} syslog_fix_perms: root:wheel {% elif variant in ["suse"] %} @@ -32,9 +33,9 @@ disable_root: false disable_root: true {% endif %} -{% if variant in ["almalinux", "alpine", "amazon", "centos", "cloudlinux", "eurolinux", - "fedora", "miraclelinux", "openEuler", "openmandriva", "rhel", "rocky", "virtuozzo"] %} -{% if variant == "rhel" %} +{% if variant in ["almalinux", "alpine", "amazon", "cloudlinux", "eurolinux", + "fedora", "miraclelinux", "openEuler", "openmandriva", "rocky", "virtuozzo"] or is_rhel %} +{% if is_rhel %} mount_default_fields: [~, ~, 'auto', 'defaults,nofail,x-systemd.requires=cloud-init.service,_netdev', '0', '2'] {% else %} mount_default_fields: [~, ~, 'auto', 'defaults,nofail', '0', '2'] @@ -70,7 +71,7 @@ network: config: disabled {% endif %} -{% if variant == "rhel" %} +{% if is_rhel %} # Default redhat settings: ssh_deletekeys: true ssh_genkeytypes: ['rsa', 'ecdsa', 'ed25519'] @@ -122,16 +123,16 @@ cloud_config_modules: {% endif %} {% if variant not in ["photon"] %} - ssh-import-id -{% if variant not in ["rhel"] %} +{% if not is_rhel %} - keyboard {% endif %} - locale {% endif %} - set-passwords -{% if variant in ["rhel"] %} +{% if is_rhel %} - rh_subscription {% endif %} -{% if variant in ["rhel", "fedora", "openmandriva", "photon"] %} +{% if variant in ["fedora", "openmandriva", "photon"] or is_rhel %} {% if variant not in ["photon"] %} - spacewalk {% endif %} @@ -197,9 +198,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", "centos", "cloudlinux", "debian", +{% if variant in ["almalinux", "alpine", "amazon", "arch", "cloudlinux", "debian", "eurolinux", "fedora", "freebsd", "gentoo", "netbsd", "miraclelinux", "openbsd", "openEuler", - "openmandriva", "photon", "rhel", "rocky", "suse", "ubuntu", "virtuozzo"] %} + "openmandriva", "photon", "rocky", "suse", "ubuntu", "virtuozzo"] or is_rhel %} distro: {{ variant }} {% elif variant in ["dragonfly"] %} distro: dragonflybsd @@ -252,15 +253,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", "centos", "cloudlinux", "eurolinux", - "fedora", "gentoo", "miraclelinux", "openEuler", "openmandriva", "rhel", "rocky", "suse", "virtuozzo"] %} +{% elif variant in ["almalinux", "alpine", "amazon", "arch", "cloudlinux", "eurolinux", + "fedora", "gentoo", "miraclelinux", "openEuler", "openmandriva", "rocky", "suse", "virtuozzo"] 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 variant == "rhel" %} +{% elif is_rhel %} name: cloud-user lock_passwd: true gecos: Cloud User @@ -285,7 +286,7 @@ system_info: groups: [wheel, users] {% elif variant == "openmandriva" %} groups: [wheel, users, systemd-journal] -{% elif variant == "rhel" %} +{% elif is_rhel %} groups: [adm, systemd-journal] {% else %} groups: [wheel, adm, systemd-journal] @@ -363,7 +364,7 @@ system_info: {% elif variant in ["dragonfly"] %} network: renderers: ['freebsd'] -{% elif variant in ["rhel", "fedora"] %} +{% elif variant in ["fedora"] or is_rhel %} network: renderers: ['netplan', 'network-manager', 'networkd', 'sysconfig', 'eni'] {% elif variant == "openmandriva" %} |