Enable Amazon Linux to yum_add_repo and ca_certs. (#6767)

Adding amazon linux variant to cloud config. 
And Refreshing/Updating module values for Amazon Linux distro only.
Namely cc_ca_cert and cc_yum_add_repo.

Author: joe-usa-amzn

cloudinit/config/cc_ca_certs.py

@@ -30,13 +30,6 @@
         "ca_cert_config": "/etc/ca-certificates/conf.d/cloud-init.conf",
         "ca_cert_update_cmd": ["update-ca-bundle"],
     },
-    "fedora": {
-        "ca_cert_path": "/etc/pki/ca-trust/",
-        "ca_cert_local_path": "/usr/share/pki/ca-trust-source/",
-        "ca_cert_filename": "anchors/cloud-init-ca-cert-{cert_index}.crt",
-        "ca_cert_config": None,
-        "ca_cert_update_cmd": ["update-ca-trust"],
-    },
     "rhel": {
         "ca_cert_path": "/etc/pki/ca-trust/",
         "ca_cert_local_path": "/usr/share/pki/ca-trust-source/",
@@ -60,42 +53,28 @@
     },
 }
 
-for distro in (
-    "opensuse-microos",
-    "opensuse-tumbleweed",
-    "opensuse-leap",
-    "sle_hpc",
-    "sle-micro",
-    "sles",
-):
-    DISTRO_OVERRIDES[distro] = DISTRO_OVERRIDES["opensuse"]
-
-for distro in (
-    "almalinux",
-    "centos",
-    "cloudlinux",
-    "rocky",
-):
-    DISTRO_OVERRIDES[distro] = DISTRO_OVERRIDES["rhel"]
-
-distros = [
-    "almalinux",
+DISTRO_FAMILY = {
+    "almalinux": "rhel",
+    "amazon": "rhel",
+    "centos": "rhel",
+    "cloudlinux": "rhel",
+    "fedora": "rhel",
+    "opensuse-microos": "opensuse",
+    "opensuse-tumbleweed": "opensuse",
+    "opensuse-leap": "opensuse",
+    "rocky": "rhel",
+    "sle_hpc": "opensuse",
+    "sle-micro": "opensuse",
+    "sles": "opensuse",
+}
+
+distros = list(DISTRO_FAMILY.keys()) + [
     "aosc",
-    "centos",
-    "cloudlinux",
     "alpine",
     "debian",
-    "fedora",
     "raspberry-pi-os",
     "rhel",
-    "rocky",
     "opensuse",
-    "opensuse-microos",
-    "opensuse-tumbleweed",
-    "opensuse-leap",
-    "sle_hpc",
-    "sle-micro",
-    "sles",
     "ubuntu",
     "photon",
 ]
@@ -114,6 +93,8 @@ def _distro_ca_certs_configs(distro_name):
     @param distro_name: String providing the distro class name.
     @returns: Dict of distro configurations for ca_cert.
     """
+    if distro_name in DISTRO_FAMILY:
+        distro_name = DISTRO_FAMILY[distro_name]
     cfg = DISTRO_OVERRIDES.get(distro_name, DEFAULT_CONFIG)
     cfg["ca_cert_full_path"] = os.path.join(
         cfg["ca_cert_local_path"], cfg["ca_cert_filename"]
@@ -160,7 +141,7 @@ def disable_default_ca_certs(distro_name, distro_cfg):
     @param distro_name: String providing the distro class name.
     @param distro_cfg: A hash providing _distro_ca_certs_configs function.
     """
-    if distro_name in ["rhel", "photon"]:
+    if distro_name in ["rhel", "photon", "amazon"]:
         remove_default_ca_certs(distro_cfg)
     elif distro_name in [
         "alpine",

cloudinit/config/cc_yum_add_repo.py

@@ -21,6 +21,7 @@
     "id": "cc_yum_add_repo",
     "distros": [
         "almalinux",
+        "amazon",
         "azurelinux",
         "centos",
         "cloudlinux",

config/cloud.cfg.tmpl

@@ -97,13 +97,6 @@ apt:
 #     timeout: 5 # (defaults to 50 seconds)
 #     max_wait: 10 # (defaults to 120 seconds)
 
-{% if variant == "amazon" %}
-# Amazon Linux relies on ec2-net-utils for network configuration
-network:
-  config: disabled
-
-{% endif -%}
-
 {% if is_rhel %}
 # Default redhat settings:
 ssh_deletekeys: true
@@ -168,12 +161,12 @@ cloud_config_modules:
 {% if variant == "ubuntu" %}
   - ubuntu_pro
 {% endif %}
-{% elif variant in ["azurelinux", "fedora", "mariner", "openeuler",
+{% elif variant in ["amazon", "azurelinux", "fedora", "mariner", "openeuler",
                     "openmandriva", "photon"] or is_rhel %}
 {% if is_rhel %}
   - rh_subscription
 {% endif %}
-{% if variant not in ["azurelinux", "mariner", "photon"] %}
+{% if variant not in ["amazon", "azurelinux", "mariner", "photon"] %}
   - spacewalk
 {% endif %}
   - yum_add_repo