diff --git a/ansible/roles/dnf/tasks/custom-repo.yml b/ansible/roles/dnf/tasks/custom-repo.yml index a20018e92..b7e66de76 100644 --- a/ansible/roles/dnf/tasks/custom-repo.yml +++ b/ansible/roles/dnf/tasks/custom-repo.yml @@ -26,6 +26,8 @@ username: "{{ item.value.username | default(omit) }}" state: "{{ item.value.state | default(omit)}}" with_dict: "{{ dnf_custom_repos }}" + loop_control: + label: "{{ item.key }}" register: register_dnf_command retries: 3 delay: 10 diff --git a/doc/requirements.txt b/doc/requirements.txt index 51a2c6498..33ba4efa0 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -7,3 +7,6 @@ reno>=3.1.0 # Apache-2.0 sphinx>=2.0.0,!=2.1.0 # BSD sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD whereto>=0.3.0 # Apache-2.0 +# NOTE(priteau): pin setuptools +# https://setuptools.pypa.io/en/stable/history.html#v82-0-0 +setuptools==81.0.0 diff --git a/releasenotes/notes/dnf-loop-control-6e2c8ba1915d2631.yaml b/releasenotes/notes/dnf-loop-control-6e2c8ba1915d2631.yaml new file mode 100644 index 000000000..38f8d257b --- /dev/null +++ b/releasenotes/notes/dnf-loop-control-6e2c8ba1915d2631.yaml @@ -0,0 +1,11 @@ +--- +security: + - | + Avoid leaking DNF repository username/password credentials in the Kayobe + output by adding loop control to print only the repository key. + `LP#2087938 `__ +fixes: + - | + Avoid leaking DNF repository username/password credentials in the Kayobe + output by adding loop control to print only the repository key. + `LP#2087938 `__ diff --git a/requirements.txt b/requirements.txt index 7d7ba3710..a7008bfff 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,6 @@ +# NOTE(wszumski): pin setuptools +# https://setuptools.pypa.io/en/stable/history.html#v82-0-0 +setuptools==81.0.0 pbr>=2.0 # Apache-2.0 Jinja2>3 # BSD ansible>=8,<10 # GPLv3