From d36f24362d77942e8918c003060420f5e5171caf Mon Sep 17 00:00:00 2001
From: Bertrand Lallau <bertrand.lallau@thalesgroup.com>
Date: Thu, 7 Sep 2017 13:54:44 +0200
Subject: [PATCH] Fix iscsi and tgt containers deployment case

In the following config:
enable_cinder=False
enable_cinder_backend_iscsi=True

Iscsi and tgt containers are deployed but should not.
This patch fix it.

Change-Id: I1d66627b9979b5dc570bbc3e1e865311dd7e7bb0
Closes-Bug: #1715618
---
 ansible/group_vars/all.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index daadbaaf37..fda3a75322 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -395,7 +395,7 @@ enable_horizon_zun: "{{ enable_zun | bool }}"
 enable_hyperv: "no"
 enable_influxdb: "no"
 enable_ironic: "no"
-enable_iscsid: "{{ enable_cinder_backend_iscsi | bool or enable_ironic | bool }}"
+enable_iscsid: "{{ (enable_cinder | bool and enable_cinder_backend_iscsi | bool) or enable_ironic | bool }}"
 enable_karbor: "no"
 enable_kuryr: "no"
 enable_magnum: "no"