openstack/kolla-ansible
Code Issues Proposed changes

Merge "Adding variables for Cinder iSCSI backend configuration"

Browse Source
This commit is contained in:
Jenkins 2016-05-23 09:52:48 +00:00 committed by Gerrit Code Review
commit fef79059b7
3 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ansible/group_vars/all.yml
View File

@ -231,8 +231,12 @@ kibana_user: "kibana"
################################# #################################
# Cinder - Block Storage options # Cinder - Block Storage options
################################# #################################
cinder_volume_driver: "{{ 'ceph' if enable_ceph | bool else 'lvm' }}" 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 }}"
################### ###################
# Ceph options # Ceph options

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

@ -9,7 +9,7 @@ use_forwarded_for = true
use_stderr = False use_stderr = False
enable_v1_api=false enable_v1_api=false
volume_name_template = %s volume_name_template = volume-%s
glance_api_servers = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ glance_api_port }} glance_api_servers = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ glance_api_port }}
glance_api_version = 2 glance_api_version = 2
@ -17,8 +17,7 @@ glance_api_version = 2
os_region_name = {{ openstack_region_name }} os_region_name = {{ openstack_region_name }}
{% if cinder_volume_driver == "lvm" %} {% if cinder_volume_driver == "lvm" %}
default_volume_type = lvmdriver-1 enabled_backends = {{ cinder_volume_backend_name }}
enabled_backends = lvmdriver-1
{% elif cinder_volume_driver == "ceph" %} {% elif cinder_volume_driver == "ceph" %}
default_volume_type = rbd-1 default_volume_type = rbd-1
enabled_backends = rbd-1 enabled_backends = rbd-1
@ -73,11 +72,13 @@ rabbit_hosts = {% for host in groups['rabbitmq'] %}{{ hostvars[host]['ansible_'
{% if cinder_volume_driver == "lvm" %} {% if cinder_volume_driver == "lvm" %}
[lvmdriver-1] [{{ cinder_volume_backend_name }}]
lvm_type = default volume_group = {{ cinder_volume_group }}
volume_group = cinder-volumes
volume_driver = cinder.volume.drivers.lvm.LVMVolumeDriver volume_driver = cinder.volume.drivers.lvm.LVMVolumeDriver
volume_backend_name = lvmdriver-1 volume_backend_name = {{ cinder_volume_backend_name }}
iscsi_ip_address = {{ cinder_iscsi_ip_address }}
iscsi_helper = {{ cinder_iscsi_helper }}
iscsi_protocol = {{ cinder_iscsi_protocol }}
{% elif cinder_volume_driver == "ceph" %} {% elif cinder_volume_driver == "ceph" %}
[rbd-1] [rbd-1]
volume_driver = cinder.volume.drivers.rbd.RBDDriver volume_driver = cinder.volume.drivers.rbd.RBDDriver

10
etc/kolla/globals.yml
View File

@ -135,6 +135,16 @@ neutron_external_interface: "eth1"
#ceph_pool_type: "replicated" #ceph_pool_type: "replicated"
#######################
# Cinder iSCSI options
#######################
# Cinder's iSCSI backend !!!REQUIRES!!! two parameters:
# 1 - IP address of the server hosting LVM Volume group
# 2 - The name of Volume group which Cinder will use.
#cinder_iscsi_ip_address:
#cinder_volume_group:
####################################### #######################################
# Manila - Shared File Systems Options # Manila - Shared File Systems Options
####################################### #######################################