Merge "External Ceph: copy also cinder keyring to nova services"
This commit is contained in:
commit
e5ba7adc5f
@ -31,7 +31,6 @@
|
|||||||
- cinder_backend_ceph | bool
|
- cinder_backend_ceph | bool
|
||||||
- external_ceph_cephx_enabled | bool
|
- external_ceph_cephx_enabled | bool
|
||||||
|
|
||||||
# NOTE: nova-compute and nova-libvirt only need ceph.client.nova.keyring.
|
|
||||||
- name: Copy over ceph nova keyring file
|
- name: Copy over ceph nova keyring file
|
||||||
copy:
|
copy:
|
||||||
src: "{{ nova_cephx_keyring_file.stat.path }}"
|
src: "{{ nova_cephx_keyring_file.stat.path }}"
|
||||||
@ -48,6 +47,21 @@
|
|||||||
notify:
|
notify:
|
||||||
- Restart {{ item }} container
|
- Restart {{ item }} container
|
||||||
|
|
||||||
|
- name: Copy over ceph cinder keyring file
|
||||||
|
copy:
|
||||||
|
src: "{{ cinder_cephx_keyring_file.stat.path }}"
|
||||||
|
dest: "{{ node_config_directory }}/{{ item }}/"
|
||||||
|
mode: "0660"
|
||||||
|
become: true
|
||||||
|
with_items: # NOTE: nova-libvirt does not need it
|
||||||
|
- nova-compute
|
||||||
|
when:
|
||||||
|
- inventory_hostname in groups[nova_cell_compute_group]
|
||||||
|
- nova_backend == "rbd"
|
||||||
|
- external_ceph_cephx_enabled | bool
|
||||||
|
notify:
|
||||||
|
- Restart {{ item }} container
|
||||||
|
|
||||||
- name: Copy over ceph.conf
|
- name: Copy over ceph.conf
|
||||||
template:
|
template:
|
||||||
src: "{{ node_custom_config }}/nova/ceph.conf"
|
src: "{{ node_custom_config }}/nova/ceph.conf"
|
||||||
|
@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
fixes:
|
||||||
|
- |
|
||||||
|
External Ceph: copy also cinder keyring to nova-compute. Since Train
|
||||||
|
nova-compute needs also the cinder key in case rbd user is set to Cinder,
|
||||||
|
because volume/pool checks have been moved to use rbd python library.
|
||||||
|
Fixes `LP#1859408 <https://bugs.launchpad.net/kolla-ansible/+bug/1859408>`__
|
Loading…
x
Reference in New Issue
Block a user