openstack/kolla-ansible
Code Issues Proposed changes

Extract cinder_iscsi_helper default from role

Browse Source 
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
This commit is contained in:
Will Miller 2018-08-02 14:18:57 +00:00
parent e71df7dbae
commit 33598f5821
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/group_vars/all.yml
View File

@ -669,6 +669,7 @@ gnocchi_incoming_storage: "{{ 'redis' if enable_redis | bool else '' }}"
cinder_backend_ceph: "{{ enable_ceph }}" cinder_backend_ceph: "{{ enable_ceph }}"
cinder_backend_vmwarevc_vmdk: "no" cinder_backend_vmwarevc_vmdk: "no"
cinder_volume_group: "cinder-volumes" cinder_volume_group: "cinder-volumes"
cinder_iscsi_helper: "tgtadm"
# Valid options are [ nfs, swift, ceph ] # Valid options are [ nfs, swift, ceph ]
cinder_backup_driver: "ceph" cinder_backup_driver: "ceph"

1
ansible/roles/cinder/defaults/main.yml
View File

@ -178,7 +178,6 @@ cinder_backends:
enabled: "{{ enable_cinder_backend_zfssa_iscsi | bool }}" enabled: "{{ enable_cinder_backend_zfssa_iscsi | bool }}"
cinder_enabled_backends: "{{ cinder_backends|selectattr('enabled', 'equalto', true)|list }}" cinder_enabled_backends: "{{ cinder_backends|selectattr('enabled', 'equalto', true)|list }}"
cinder_iscsi_helper: "tgtadm"
############################################# #############################################
# Hitachi NAS Platform iSCSI and NFS drivers # Hitachi NAS Platform iSCSI and NFS drivers