Skip to content

Enable Amazon Linux to yum_add_repo and ca_certs. #6613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
joeysk2012 wants to merge 1 commit into from
+11 −9
Closed

Enable Amazon Linux to yum_add_repo and ca_certs. #6613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions cloudinit/config/cc_ca_certs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,13 @@
"ca_cert_config": None,
"ca_cert_update_cmd": ["rehash_ca_certificates.sh"],
},
"amazon": {
"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"],
},
}

for distro in (
Expand All @@ -80,6 +87,7 @@

distros = [
"almalinux",
"amazon",
"aosc",
"centos",
"cloudlinux",
Expand Down
1 change: 1 addition & 0 deletions cloudinit/config/cc_yum_add_repo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"id": "cc_yum_add_repo",
"distros": [
"almalinux",
"amazon",
"azurelinux",
"centos",
"cloudlinux",
Expand Down
11 changes: 2 additions & 9 deletions config/cloud.cfg.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down