openstack/kolla-ansible
Code Issues Proposed changes

Merge "Update ceph-mon keyrings"

Browse Source
This commit is contained in:
Jenkins 2016-01-29 18:47:57 +00:00 committed by Gerrit Code Review
commit 5fc2794eb0
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/roles/ceph/tasks/distribute_keyrings.yml
View File

@ -30,6 +30,7 @@
with_items: with_items:
- "{{ ceph_files['ceph.client.admin.keyring'] }}" - "{{ ceph_files['ceph.client.admin.keyring'] }}"
- "{{ ceph_files['ceph.client.mon.keyring'] }}" - "{{ ceph_files['ceph.client.mon.keyring'] }}"
- "{{ ceph_files['ceph.client.radosgw.keyring'] }}"
- "{{ ceph_files['ceph.monmap'] }}" - "{{ ceph_files['ceph.monmap'] }}"
when: inventory_hostname in groups['ceph-mon'] when: inventory_hostname in groups['ceph-mon']

7
ansible/roles/ceph/templates/ceph-mon.json.j2
View File

@ -21,6 +21,13 @@
"perm": "0600", "perm": "0600",
"optional": "True" "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", "source": "{{ container_config_directory }}/ceph.monmap",
"dest": "/etc/ceph/ceph.monmap", "dest": "/etc/ceph/ceph.monmap",