summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-05-29 11:26:44 (GMT)
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-06-04 13:50:41 (GMT)
commit52c643512856c2eabdf3e1c578415776aa090d6e (patch)
tree643fcf3cf12f5c0be1d008cf818283511277a619
parent6af95c43d601223e1d589cdae1ffda7acb7e60ad (diff)
downloaddefinitions-52c643512856c2eabdf3e1c578415776aa090d6e.tar.gz
Cinder: Configure cinder.conf for Kilo 2015.1.0
-rw-r--r--install-files/openstack/usr/share/openstack/cinder/cinder.conf62
1 files changed, 34 insertions, 28 deletions
diff --git a/install-files/openstack/usr/share/openstack/cinder/cinder.conf b/install-files/openstack/usr/share/openstack/cinder/cinder.conf
index 8afdb94..dafd89b 100644
--- a/install-files/openstack/usr/share/openstack/cinder/cinder.conf
+++ b/install-files/openstack/usr/share/openstack/cinder/cinder.conf
@@ -1,5 +1,7 @@
[DEFAULT]
+use_syslog = True
+
#
# Options defined in oslo.messaging
#
@@ -45,7 +47,7 @@
# Driver or drivers to handle sending notifications. (multi
# valued)
-#notification_driver=
+notification_driver=messagingv2
# AMQP topic used for OpenStack notifications. (list value)
# Deprecated group/name - [rpc_notifier2]/topics
@@ -61,12 +63,12 @@
# The messaging driver to use, defaults to rabbit. Other
# drivers include qpid and zmq. (string value)
-#rpc_backend=rabbit
+rpc_backend=rabbit
# The default exchange under which topics are scoped. May be
# overridden by an exchange name specified in the
# transport_url option. (string value)
-#control_exchange=openstack
+control_exchange=cinder
#
@@ -481,18 +483,18 @@
# File name for the paste.deploy config for cinder-api (string
# value)
-#api_paste_config=api-paste.ini
+api_paste_config=api-paste.ini
# Top-level directory for maintaining cinder's state (string
# value)
# Deprecated group/name - [DEFAULT]/pybasedir
-#state_path=/var/lib/cinder
+state_path=/var/lib/cinder
# IP address of this host (string value)
-#my_ip=10.0.0.1
+my_ip={{ MANAGEMENT_INTERFACE_IP_ADDRESS }}
# Default glance host name or IP (string value)
-#glance_host=$my_ip
+glance_host={{ CONTROLLER_HOST_ADDRESS }}
# Default glance port (integer value)
#glance_port=9292
@@ -586,7 +588,7 @@
# Path to the rootwrap configuration file to use for running
# commands as root (string value)
-#rootwrap_config=/etc/cinder/rootwrap.conf
+rootwrap_config=/etc/cinder/rootwrap.conf
# Enable monkey patching (boolean value)
#monkey_patch=false
@@ -608,7 +610,7 @@
# The strategy to use for auth. Supports noauth, keystone, and
# deprecated. (string value)
-#auth_strategy=noauth
+auth_strategy=keystone
# A list of backend names to use. These backend names should
# be backed by a unique [CONFIG] group with its options (list
@@ -698,15 +700,15 @@
# Template string to be used to generate volume names (string
# value)
-#volume_name_template=volume-%s
+volume_name_template=volume-%s
# Template string to be used to generate snapshot names
# (string value)
-#snapshot_name_template=snapshot-%s
+snapshot_name_template=snapshot-%s
# Template string to be used to generate backup names (string
# value)
-#backup_name_template=backup-%s
+backup_name_template=backup-%s
#
@@ -941,7 +943,7 @@
# The IP address that the iSCSI daemon is listening on (string
# value)
-#iscsi_ip_address=$my_ip
+iscsi_ip_address={{ MANAGEMENT_INTERFACE_IP_ADDRESS }}
# The list of secondary IP addresses of the iSCSI daemon (list
# value)
@@ -958,7 +960,7 @@
# The backend name for a given driver implementation (string
# value)
-#volume_backend_name=<None>
+volume_backend_name=LVM_iSCSI
# Do we attach/detach volumes in cinder using multipath for
# volume to image and image to volume transfers? (boolean
@@ -987,10 +989,10 @@
# support, iseradm for the ISER protocol, ietadm for iSCSI
# Enterprise Target, iscsictl for Chelsio iSCSI Target or fake
# for testing. (string value)
-#iscsi_helper=tgtadm
+iscsi_helper=lioadm
# Volume configuration file storage directory (string value)
-#volumes_dir=$state_path/volumes
+volumes_dir=$state_path/volumes
# IET configuration file (string value)
#iet_conf=/etc/iet/ietd.conf
@@ -1588,7 +1590,7 @@
# Name for the VG that will contain exported volumes (string
# value)
-#volume_group=cinder-volumes
+volume_group=cinder-volumes
# If >0, create LVs with multiple mirrors. Note that this
# requires lvm_mirrors + 2 PVs with available space (integer
@@ -2261,7 +2263,7 @@
#
# Driver to use for volume creation (string value)
-#volume_driver=cinder.volume.drivers.lvm.LVMISCSIDriver
+volume_driver=cinder.volume.drivers.lvm.LVMISCSIDriver
# Timeout for creating the volume to migrate to when
# performing volume migration (seconds) (integer value)
@@ -2357,6 +2359,10 @@
# Deprecated group/name - [DEFAULT]/dbapi_use_tpool
#use_tpool=false
+# The SQLAlchemy connection string to use to connect to the
+# database. (string value)
+connection=postgresql://{{ CINDER_DB_USER }}:{{ CINDER_DB_PASSWORD }}@{{ CONTROLLER_HOST_ADDRESS }}/cinder
+
[fc-zone-manager]
@@ -2435,7 +2441,7 @@
#
# Complete public Identity API endpoint. (string value)
-#auth_uri=<None>
+auth_uri=http://{{ CONTROLLER_HOST_ADDRESS }}:5000/v2.0
# API version of the admin Identity API endpoint. (string
# value)
@@ -2740,23 +2746,23 @@
# The RabbitMQ broker address where a single node is used.
# (string value)
-#rabbit_host=localhost
+rabbit_host={{ RABBITMQ_HOST }}
# The RabbitMQ broker port where a single node is used.
# (integer value)
-#rabbit_port=5672
+rabbit_port={{ RABBITMQ_PORT }}
# RabbitMQ HA cluster host:port pairs. (list value)
-#rabbit_hosts=$rabbit_host:$rabbit_port
+rabbit_hosts=$rabbit_host:$rabbit_port
# Connect over SSL for RabbitMQ. (boolean value)
#rabbit_use_ssl=false
# The RabbitMQ userid. (string value)
-#rabbit_userid=guest
+rabbit_userid={{ RABBITMQ_USER }}
# The RabbitMQ password. (string value)
-#rabbit_password=guest
+rabbit_password={{ RABBITMQ_PASSWORD }}
# The RabbitMQ login method. (string value)
#rabbit_login_method=AMQPLAIN
@@ -2962,7 +2968,7 @@
# Complete admin Identity API endpoint. This should specify the
# unversioned root endpoint e.g. https://localhost:35357/ (string
# value)
-#identity_uri = <None>
+identity_uri = http://{{ CONTROLLER_HOST_ADDRESS }}:35357
# This option is deprecated and may be removed in a future release.
# Single shared secret with the Keystone configuration used for
@@ -2972,10 +2978,10 @@
#admin_token = <None>
# Service username. (string value)
-#admin_user = <None>
+admin_user = {{ CINDER_SERVICE_USER }}
# Service user password. (string value)
-#admin_password = <None>
+admin_password = {{ CINDER_SERVICE_PASSWORD }}
# Service tenant name. (string value)
-#admin_tenant_name = admin
+admin_tenant_name = service