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
This commit is contained in:
Bertrand Lallau 2017-09-07 13:54:44 +02:00 committed by Bertrand Lallau
parent 33513db407
commit d36f24362d

View File

@ -395,7 +395,7 @@ enable_horizon_zun: "{{ enable_zun | bool }}"
enable_hyperv: "no" enable_hyperv: "no"
enable_influxdb: "no" enable_influxdb: "no"
enable_ironic: "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_karbor: "no"
enable_kuryr: "no" enable_kuryr: "no"
enable_magnum: "no" enable_magnum: "no"