From 92427a6531aca062d3e4cb536b0db55992aa0ef6 Mon Sep 17 00:00:00 2001 From: Chenjun Shen Date: Tue, 10 Jul 2018 10:15:10 +0200 Subject: [PATCH] Fix "configure container (other services)" when statement Configure container (other services) task should be executed when cinder_volume uses other than lvm as backend (for example. rbd). But the existing code completely skips both "Configure container (cinder-volume)" and "Configure container (other services)" tasks. So the cinder_volume container is not properly initialized when using rbd as backend. Change-Id: Ieb195e8a0cd3435fa3e872b609717aadc2ff41e8 Closes-Bug: #1780789 Closes-Bug: #1756005 --- playbooks/common-playbooks/cinder.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/playbooks/common-playbooks/cinder.yml b/playbooks/common-playbooks/cinder.yml index 990c504a33..67e6b0d40f 100644 --- a/playbooks/common-playbooks/cinder.yml +++ b/playbooks/common-playbooks/cinder.yml @@ -42,7 +42,7 @@ vars: network_address: "storage_address" - - name: Configure container (cinder-volume) + - name: Configure container (cinder-volume) when lvm is in-use include: "../common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml" static: no vars: @@ -62,7 +62,7 @@ static: no when: - "not is_metal" - - "'cinder_volume' not in group_names" + - "not ( 'cinder_volume' in group_names and cinder_backend_lvm_inuse | bool )" - name: Configure log directories (on metal) include: ../common-tasks/os-log-dir-setup.yml