Skip to content

Commit b8db321

Browse files
authored
Merge pull request #1610 from stackhpc/fix/rgw-usage-exporter-creds-check
Fix RADOS gateway usage exporter deployment
2 parents 08d0735 + 9dfc157 commit b8db321

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

etc/kayobe/ansible/deploy-radosgw-usage-exporter.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
vars:
6767
ansible_host: "{{ hostvars[groups['controllers'][0]].ansible_host }}"
6868
run_once: true
69-
when: credential_check.stdout == []
69+
when: credential_check.stdout | from_json == []
7070

7171
- name: Query ec2 credential for ceph_rgw
7272
ansible.builtin.command: >
@@ -115,6 +115,7 @@
115115
ACCESS_KEY: "{{ ec2.Access }}"
116116
SECRET_KEY: "{{ ec2.Secret }}"
117117
VIRTUAL_PORT: "{{ stackhpc_radosgw_usage_exporter_port | string }}"
118+
REQUESTS_CA_BUNDLE: "/etc/ssl/certs/ca-certificates.crt"
118119
entrypoint: "{{ ['python', '-u', './radosgw_usage_exporter.py', '--insecure'] if not stackhpc_radosgw_usage_exporter_verify else omit }}"
119120
vars:
120121
ec2: "{{ credential.stdout | from_json | first }}"
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
fixes:
3+
- |
4+
Fixed RADOS gateway usage exporter deployment failing
5+
to generate ec2 credentials for the ceph_rgw user.
6+
- |
7+
Fixed RADOS gateway usage exporter not using the system
8+
trust root as its CA bundle.

0 commit comments

Comments
 (0)