diff --git a/ansible/host-package-update.yml b/ansible/host-package-update.yml index 77be7c722..6e99df86a 100644 --- a/ansible/host-package-update.yml +++ b/ansible/host-package-update.yml @@ -16,5 +16,5 @@ name: "{{ host_package_update_packages }}" security: "{{ host_package_update_security | bool if ansible_facts.os_family == 'RedHat' else omit }}" state: latest - update_cache: "{{ True if ansible_facts.os_family == 'Debian' else omit }}" + update_cache: True become: true diff --git a/ansible/roles/ironic-inspector-rules/library/os_ironic_inspector_rule.py b/ansible/roles/ironic-inspector-rules/library/os_ironic_inspector_rule.py index c84743a51..896ad793c 100644 --- a/ansible/roles/ironic-inspector-rules/library/os_ironic_inspector_rule.py +++ b/ansible/roles/ironic-inspector-rules/library/os_ironic_inspector_rule.py @@ -88,7 +88,7 @@ def _ensure_rule_present(module, client): if not response.ok: if response.status_code != 404: module.fail_json(msg="Failed retrieving Inspector rule %s: %s" - % (module.params['uuid'], repr(e))) + % (module.params['uuid'], response.text)) else: rule = response.json() # Check whether the rule differs from the request. diff --git a/doc/source/installation.rst b/doc/source/installation.rst index b301e8d18..a70db3854 100644 --- a/doc/source/installation.rst +++ b/doc/source/installation.rst @@ -5,9 +5,9 @@ Installation ============ Kayobe can be installed via the released Python packages on PyPI, or from -source. Installing from PyPI ensures the use of well used and tested software, -whereas installing from source allows for the use of unreleased or patched -code. Installing from a Python package is supported from Kayobe 5.0.0 onwards. +source. Installing from source using stable branches is recommended over PyPI +packages, as it provides access to bug fixes that have been merged to stable +branches since the last PyPI release. Prerequisites ============= diff --git a/releasenotes/notes/bug-2162058-17526c834c348df3.yaml b/releasenotes/notes/bug-2162058-17526c834c348df3.yaml new file mode 100644 index 000000000..37d39d83d --- /dev/null +++ b/releasenotes/notes/bug-2162058-17526c834c348df3.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Fixes displaying the error when a failure to retrieve an inspection rule + occurs. `LP#2162058 `__ diff --git a/releasenotes/notes/update-dnf-cache-63b0249549118a3e.yaml b/releasenotes/notes/update-dnf-cache-63b0249549118a3e.yaml new file mode 100644 index 000000000..0f16102f0 --- /dev/null +++ b/releasenotes/notes/update-dnf-cache-63b0249549118a3e.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + Adds support for updating cache during host package update on all + supported systems. diff --git a/roles/kayobe-ci-prep/tasks/main.yml b/roles/kayobe-ci-prep/tasks/main.yml index faea392e8..11847e719 100644 --- a/roles/kayobe-ci-prep/tasks/main.yml +++ b/roles/kayobe-ci-prep/tasks/main.yml @@ -64,7 +64,7 @@ - name: Install kernel-modules-extra for running kernel ansible.builtin.dnf: - name: "kernel-modules-extra" + name: "kernel-modules-extra-{{ ansible_facts.kernel }}" state: present when: ansible_facts.os_family == 'RedHat'