openstack/kolla-ansible
Code Issues Proposed changes

Merge "External Ceph: template cinder backend config when cinder_backend_ceph"

Browse Source
This commit is contained in:
Zuul 2019-12-16 19:34:44 +00:00 committed by Gerrit Code Review
commit da105c20ee
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/cinder/defaults/main.yml
View File

@ -181,7 +181,7 @@ openstack_cinder_auth: "{{ openstack_auth }}"
#################### ####################
cinder_backends: cinder_backends:
- name: "rbd-1" - name: "rbd-1"
enabled: "{{ enable_ceph | bool and cinder_backend_ceph | bool }}" enabled: "{{ cinder_backend_ceph | bool }}"
- name: "lvm-1" - name: "lvm-1"
enabled: "{{ enable_cinder_backend_lvm | bool }}" enabled: "{{ enable_cinder_backend_lvm | bool }}"
- name: "nfs-1" - name: "nfs-1"

2
ansible/roles/cinder/templates/cinder.conf.j2
View File

@ -119,7 +119,7 @@ target_helper = {{ cinder_target_helper }}
target_protocol = iscsi target_protocol = iscsi
{% endif %} {% endif %}
{% if enable_ceph | bool and cinder_backend_ceph | bool %} {% if cinder_backend_ceph | bool %}
[rbd-1] [rbd-1]
volume_driver = cinder.volume.drivers.rbd.RBDDriver volume_driver = cinder.volume.drivers.rbd.RBDDriver
volume_backend_name = rbd-1 volume_backend_name = rbd-1

8
releasenotes/notes/external-ceph-cinder-template-40dc0bc07e717837.yaml Normal file
View File

@ -0,0 +1,8 @@
---
upgrade:
- |
Default behavior for generating cinder.conf template has changed,
now cinder.conf with rbd-1 section will be generated when external Ceph
functionality is used i.e. cinder_backend_ceph is set to true.
Previously it was only included when Kolla-Ansible internal
Ceph deployment mechanism was used.