diff --git a/changelogs/fragments/553-repositories-move-check-fips.yml b/changelogs/fragments/553-repositories-move-check-fips.yml new file mode 100644 index 00000000..77f2929f --- /dev/null +++ b/changelogs/fragments/553-repositories-move-check-fips.yml @@ -0,0 +1,3 @@ +--- +bugfixes: + - repositories - Move fips check to satellite CA install block (https://github.com/oVirt/ovirt-ansible-collection/pull/553). diff --git a/roles/repositories/tasks/install-satellite-ca.yml b/roles/repositories/tasks/install-satellite-ca.yml index 03af516f..b8460f29 100644 --- a/roles/repositories/tasks/install-satellite-ca.yml +++ b/roles/repositories/tasks/install-satellite-ca.yml @@ -1,4 +1,12 @@ --- +- name: Check if FIPS is enabled + ansible.builtin.command: cat /proc/sys/crypto/fips_enabled + changed_when: false + register: fips_check_command + +- name: Set FIPS enabled variable + ansible.builtin.set_fact: + ovirt_repositories_fips_enabled: "{{ fips_check_command.stdout == '1' }}" - name: Install Satellite certificates wihtout FIPS ansible.builtin.dnf: diff --git a/roles/repositories/tasks/main.yml b/roles/repositories/tasks/main.yml index e06ee05e..0f1d5fe0 100644 --- a/roles/repositories/tasks/main.yml +++ b/roles/repositories/tasks/main.yml @@ -10,15 +10,6 @@ include_tasks: backup-repos.yml when: ovirt_repositories_repos_backup -- name: Check if FIPS is enabled - ansible.builtin.command: cat /proc/sys/crypto/fips_enabled - changed_when: false - register: fips_check_command - -- name: Set FIPS enabled variable - ansible.builtin.set_fact: - ovirt_repositories_fips_enabled: "{{ fips_check_command.stdout == '1' }}" - - name: Setup repositories block: - name: Install Satellite CA