diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-29 18:47:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-29 18:47:57 +0000 |
| commit | 5fc2794eb0a57189d82912958b093dca979069aa (patch) | |
| tree | 19e3c75d87ec429a92a68b9f2368cf6a45145e30 | |
| parent | 5190742740aa5b9cb07afa84166a65f5203f7854 (diff) | |
| parent | 33f3e1d8caa57f2582d9a19edc446837165627f5 (diff) | |
| download | kolla-5fc2794eb0a57189d82912958b093dca979069aa.tar.gz kolla-5fc2794eb0a57189d82912958b093dca979069aa.zip | |
Merge "Update ceph-mon keyrings"
| -rw-r--r-- | ansible/roles/ceph/tasks/distribute_keyrings.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/ceph/templates/ceph-mon.json.j2 | 7 |
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", |