diff options
| author | Zuul <zuul@review.opendev.org> | 2026-09-16 23:16:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2026-09-16 23:16:00 +0000 |
| commit | 7c45608cf7dd251a334ac888a19ad7d8c053a165 (patch) | |
| tree | 185fb93365a95cfa16bcb6845ab0f783c549567a | |
| parent | 9c408e5af204cd3e3bdb86dae6ee691f48c1daa2 (diff) | |
| parent | 8d5cc5ef66b140fb1f2c1b03d57c9c85f457b1af (diff) | |
| download | kolla-ansible-7c45608cf7dd251a334ac888a19ad7d8c053a165.tar.gz kolla-ansible-7c45608cf7dd251a334ac888a19ad7d8c053a165.zip | |
Merge "prometheus: accept vault-encrypted values in precheck" into stable/2026.1
| -rw-r--r-- | ansible/roles/prometheus/tasks/precheck.yml | 8 | ||||
| -rw-r--r-- | releasenotes/notes/fix_prometheus_vault_prechecks-5335880cd18680dd.yaml | 10 |
2 files changed, 14 insertions, 4 deletions
diff --git a/ansible/roles/prometheus/tasks/precheck.yml b/ansible/roles/prometheus/tasks/precheck.yml index d4bdf0eba..5b98a09b4 100644 --- a/ansible/roles/prometheus/tasks/precheck.yml +++ b/ansible/roles/prometheus/tasks/precheck.yml @@ -28,21 +28,21 @@ ansible.builtin.assert: that: - prometheus_bcrypt_salt is defined - - prometheus_bcrypt_salt is string + - prometheus_bcrypt_salt is string or prometheus_bcrypt_salt is vault_encrypted - prometheus_bcrypt_salt | length == 22 - name: Check that prometheus_password is correctly set ansible.builtin.assert: that: - prometheus_password is defined - - prometheus_password is string + - prometheus_password is string or prometheus_password is vault_encrypted - prometheus_password | length > 0 - name: Check that prometheus_grafana_password is correctly set ansible.builtin.assert: that: - prometheus_grafana_password is defined - - prometheus_grafana_password is string + - prometheus_grafana_password is string or prometheus_grafana_password is vault_encrypted - prometheus_grafana_password | length > 0 when: enable_grafana | bool @@ -50,7 +50,7 @@ ansible.builtin.assert: that: - prometheus_skyline_password is defined - - prometheus_skyline_password is string + - prometheus_skyline_password is string or prometheus_skyline_password is vault_encrypted - prometheus_skyline_password | length > 0 when: enable_skyline | bool diff --git a/releasenotes/notes/fix_prometheus_vault_prechecks-5335880cd18680dd.yaml b/releasenotes/notes/fix_prometheus_vault_prechecks-5335880cd18680dd.yaml new file mode 100644 index 000000000..8a6bc53a9 --- /dev/null +++ b/releasenotes/notes/fix_prometheus_vault_prechecks-5335880cd18680dd.yaml @@ -0,0 +1,10 @@ +--- +fixes: + - | + Fixes Prometheus precheck failing on ``prometheus_bcrypt_salt``, + ``prometheus_password``, ``prometheus_grafana_password`` and + ``prometheus_skyline_password`` when these are Ansible Vault encrypted + values, due to a known Ansible limitation where the ``is string`` Jinja + test does not recognise vault-encrypted strings. See + `ansible/ansible#33067 <https://github.com/ansible/ansible/issues/33067>`__ + for details. |