Skip to content

Commit f4b85ef

Browse files
committed
CI: Set RL9 crypto policy to DEFAULT
This should resolve SSH issues with some modern key types such as ed25519.
1 parent 840924f commit f4b85ef

File tree

3 files changed

+9
-1
lines changed
  • etc/kayobe
    • ansible/maintenance
    • environments
      • ci-aio/inventory/group_vars/cis-hardening
      • ci-multinode/inventory/group_vars/cis-hardening

3 files changed

+9
-1
lines changed

etc/kayobe/ansible/maintenance/cis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
that:
1313
- ssh_key_type != 'ed25519'
1414
fail_msg: FIPS policy does not currently support ed25519 SSH keys on RHEL family systems
15-
when: ansible_facts.os_family == 'RedHat'
15+
when: ansible_facts.os_family == 'RedHat' and rhel9cis_crypto_policy == 'FIPS'
1616

1717
- name: Ensure the cron package is installed on ubuntu
1818
ansible.builtin.package:

etc/kayobe/environments/ci-aio/inventory/group_vars/cis-hardening/cis

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
##############################################################################
33
# Rocky 9 CIS Hardening Configuration
44

5+
# NOTE: Using DEFAULT crypto policy in CI. FIPS breaks ed25519 SSH keys, and
6+
# FUTURE breaks wazuh agent repo metadata download.
7+
rhel9cis_crypto_policy: DEFAULT
8+
59
# Disable shell timeout for inactivity which can be disruptive to
610
# development work.
711
rhel9cis_rule_5_4_3_2: false

etc/kayobe/environments/ci-multinode/inventory/group_vars/cis-hardening/cis

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
##############################################################################
33
# Rocky 9 CIS Hardening Configuration
44

5+
# NOTE: Using DEFAULT crypto policy in CI. FIPS breaks ed25519 SSH keys, and
6+
# FUTURE breaks wazuh agent repo metadata download.
7+
rhel9cis_crypto_policy: DEFAULT
8+
59
# Disable shell timeout for inactivity which can be disruptive to
610
# development work.
711
rhel9cis_rule_5_4_3_2: false

0 commit comments

Comments
 (0)