diff options
| author | SamYaple <sam@yaple.net> | 2016-01-28 17:47:30 +0000 |
|---|---|---|
| committer | SamYaple <sam@yaple.net> | 2016-01-28 17:47:30 +0000 |
| commit | 33f3e1d8caa57f2582d9a19edc446837165627f5 (patch) | |
| tree | 3241a26e91c40035e37e451e12cfdb5d7cf4d659 | |
| parent | 2361fddcffbae32fa681db1b2de4530bb65cd0e5 (diff) | |
| download | kolla-33f3e1d8caa57f2582d9a19edc446837165627f5.tar.gz kolla-33f3e1d8caa57f2582d9a19edc446837165627f5.zip | |
Update ceph-mon keyrings
Since the fetch script fetched _all_ keyrings from the ceph-mon
container, the ceph-mon container must contain all keyrings. This
setup works AIO but was broken on multinode because the ceph-mon
container did not have the radosgw keyring. This issue affects every
multinode install regardless of using the radosgw or not.
TrivialFix
Change-Id: Ie416de1a5275862da6d77ef0dd174e85e499fc0f
| -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", |