From 33598f58217cf0446939208abdfba53c9e9e2105 Mon Sep 17 00:00:00 2001
From: Will Miller <willm@stackhpc.com>
Date: Thu, 2 Aug 2018 14:18:57 +0000
Subject: [PATCH] Extract cinder_iscsi_helper default from role
The variable `cinder_iscsi_helper` is used not only in the `cinder` role,
but also in the `iscsi` role. It needs to have a default accessible for
both roles.
Change-Id: I33d7f2c7b5597a541a0d104c76520ac4a1cd5026
Closes-Bug: #1785066
---
ansible/group_vars/all.yml | 1 +
ansible/roles/cinder/defaults/main.yml | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 27c94c68f3..9fd85e66db 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -669,6 +669,7 @@ gnocchi_incoming_storage: "{{ 'redis' if enable_redis | bool else '' }}"
cinder_backend_ceph: "{{ enable_ceph }}"
cinder_backend_vmwarevc_vmdk: "no"
cinder_volume_group: "cinder-volumes"
+cinder_iscsi_helper: "tgtadm"
# Valid options are [ nfs, swift, ceph ]
cinder_backup_driver: "ceph"
diff --git a/ansible/roles/cinder/defaults/main.yml b/ansible/roles/cinder/defaults/main.yml
index 4905a66467..e6b3d7c9ee 100644
--- a/ansible/roles/cinder/defaults/main.yml
+++ b/ansible/roles/cinder/defaults/main.yml
@@ -178,7 +178,6 @@ cinder_backends:
enabled: "{{ enable_cinder_backend_zfssa_iscsi | bool }}"
cinder_enabled_backends: "{{ cinder_backends|selectattr('enabled', 'equalto', true)|list }}"
-cinder_iscsi_helper: "tgtadm"
#############################################
# Hitachi NAS Platform iSCSI and NFS drivers