From 5fdd2b18cc12715bed41ad3d689528c577d0842b Mon Sep 17 00:00:00 2001
From: mgatien <m.gatien@gmail.com>
Date: Fri, 3 Jun 2016 14:40:23 -0400
Subject: [PATCH] adding else statement with empty string starting ansible 2.X
it require a else statement.
Closes-bug: #1588941
Change-Id: I3f12be8de75ddcebf28a077c361a9206b36aafb0
---
ansible/group_vars/all.yml | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 8aeabcaaa..32aae6c83 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -239,12 +239,11 @@ kibana_user: "kibana"
#################################
# Cinder - Block Storage options
#################################
-cinder_volume_driver: "{{ 'ceph' if enable_ceph | bool }}"
-cinder_volume_driver: "{{ 'lvm' if enable_iscsi | bool }}"
-cinder_volume_group: "{{ 'cinder-volumes' if enable_iscsi | bool }}"
-cinder_volume_backend_name: "{{ 'cinder-volumes' if enable_iscsi | bool }}"
-cinder_iscsi_helper: "{{ 'tgtadm' if enable_iscsi | bool }}"
-cinder_iscsi_protocol: "{{ 'iscsi' if enable_iscsi | bool }}"
+cinder_volume_driver: "{{ 'ceph' if enable_ceph | bool else 'lvm' }}"
+cinder_volume_group: "{{ 'cinder-volumes' if enable_iscsi | bool else '' }}"
+cinder_volume_backend_name: "{{ 'cinder-volumes' if enable_iscsi | bool else '' }}"
+cinder_iscsi_helper: "{{ 'tgtadm' if enable_iscsi | bool else '' }}"
+cinder_iscsi_protocol: "{{ 'iscsi' if enable_iscsi | bool else '' }}"
###################
# Ceph options
--
GitLab