aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ansible/roles/ceph/tasks/distribute_keyrings.yml1
-rw-r--r--ansible/roles/ceph/templates/ceph-mon.json.j27
2 files changed, 8 insertions, 0 deletions
diff --git a/ansible/roles/ceph/tasks/distribute_keyrings.yml b/ansible/roles/ceph/tasks/distribute_keyrings.yml
index 95658e455..ea4952a42 100644
--- a/ansible/roles/ceph/tasks/distribute_keyrings.yml
+++ b/ansible/roles/ceph/tasks/distribute_keyrings.yml
@@ -30,6 +30,7 @@
with_items:
- "{{ ceph_files['ceph.client.admin.keyring'] }}"
- "{{ ceph_files['ceph.client.mon.keyring'] }}"
+ - "{{ ceph_files['ceph.client.radosgw.keyring'] }}"
- "{{ ceph_files['ceph.monmap'] }}"
when: inventory_hostname in groups['ceph-mon']
diff --git a/ansible/roles/ceph/templates/ceph-mon.json.j2 b/ansible/roles/ceph/templates/ceph-mon.json.j2
index c4de81b8a..3ce4869e9 100644
--- a/ansible/roles/ceph/templates/ceph-mon.json.j2
+++ b/ansible/roles/ceph/templates/ceph-mon.json.j2
@@ -22,6 +22,13 @@
"optional": "True"
},
{
+ "source": "{{ container_config_directory }}/ceph.client.radosgw.keyring",
+ "dest": "/etc/ceph/ceph.client.radosgw.keyring",
+ "owner": "ceph",
+ "perm": "0600",
+ "optional": "True"
+ },
+ {
"source": "{{ container_config_directory }}/ceph.monmap",
"dest": "/etc/ceph/ceph.monmap",
"owner": "ceph",