openstack/kolla-ansible
Code Issues Proposed changes

Add enable_iscsi option to etc/kolla/globals.yml

Browse Source 
To use Cinder LVM2 backend with iSCSI,
add enable_iscsi option and fix document.

Change-Id: I286733508b5582c311c313c172b3c3a774be993c
Closes-Bug: #1599088
This commit is contained in:
Takeaki Matsumoto 2016-07-05 18:23:32 +09:00
parent 7232b60532
commit 138c6426bd
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/cinder/templates/cinder.conf.j2
View File

@ -76,7 +76,7 @@ rabbit_hosts = {% for host in groups['rabbitmq'] %}{{ hostvars[host]['ansible_'
volume_group = {{ cinder_volume_group }} volume_group = {{ cinder_volume_group }}
volume_driver = cinder.volume.drivers.lvm.LVMVolumeDriver volume_driver = cinder.volume.drivers.lvm.LVMVolumeDriver
volume_backend_name = {{ cinder_volume_backend_name }} volume_backend_name = {{ cinder_volume_backend_name }}
iscsi_ip_address = {{ cinder_iscsi_ip_address }} iscsi_ip_address = {{ hostvars[groups['tgtd'][0]]['ansible_' + hostvars[groups['tgtd'][0]]['storage_interface']]['ipv4']['address'] }}
iscsi_helper = {{ cinder_iscsi_helper }} iscsi_helper = {{ cinder_iscsi_helper }}
iscsi_protocol = {{ cinder_iscsi_protocol }} iscsi_protocol = {{ cinder_iscsi_protocol }}
{% elif cinder_volume_driver == "ceph" %} {% elif cinder_volume_driver == "ceph" %}

4
doc/cinder-guide.rst
View File

@ -98,13 +98,13 @@ between nova-compute process and the server hosting LVG.
In order to use iSCSI as a Cinder's backend, these two parameters must be In order to use iSCSI as a Cinder's backend, these two parameters must be
specified in ``globals.yml``. :: specified in ``globals.yml``. ::
cinder_iscsi_ip_address: "X.X.X.X" enable_iscsi: "yes"
cinder_volume_group: << lvg_name >> cinder_volume_group: << lvg_name >>
Where: Where:
- X.X.X.X - is IP address of a server hosting LVG
- ``lvg_name`` - is a name of LVG on that server. - ``lvg_name`` - is a name of LVG on that server.
NOTE: For Ubuntu and LVM2/iSCSI NOTE: For Ubuntu and LVM2/iSCSI

2
etc/kolla/globals.yml
View File

@ -114,6 +114,7 @@ neutron_external_interface: "eth1"
#enable_heat: "yes" #enable_heat: "yes"
#enable_horizon: "yes" #enable_horizon: "yes"
#enable_ironic: "no" #enable_ironic: "no"
#enable_iscsi: "no"
#enable_magnum: "no" #enable_magnum: "no"
#enable_manila: "no" #enable_manila: "no"
#enable_mistral: "no" #enable_mistral: "no"
@ -144,7 +145,6 @@ neutron_external_interface: "eth1"
# Cinder's iSCSI backend !!!REQUIRES!!! two parameters: # Cinder's iSCSI backend !!!REQUIRES!!! two parameters:
# 1 - IP address of the server hosting LVM Volume group # 1 - IP address of the server hosting LVM Volume group
# 2 - The name of Volume group which Cinder will use. # 2 - The name of Volume group which Cinder will use.
#cinder_iscsi_ip_address:
#cinder_volume_group: #cinder_volume_group: