Configure cinder for openstack kilo release

1 files changed, 56 insertions, 29 deletions

diff --git a/openstack/usr/share/openstack/cinder/cinder.conf b/openstack/usr/share/openstack/cinder/cinder.conf
index 8afdb941..c86b4e62 100644
--- a/openstack/usr/share/openstack/cinder/cinder.conf
+++ b/openstack/usr/share/openstack/cinder/cinder.conf
@@ -45,7 +45,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 +61,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 +481,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 +586,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,12 +608,12 @@
 
 # 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
 # value)
-#enabled_backends=<None>
+enabled_backends=lvm
 
 # Whether snapshots count against gigabyte quota (boolean
 # value)
@@ -698,7 +698,7 @@
 
 # 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)
@@ -941,7 +941,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 +958,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 +987,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
@@ -1583,7 +1583,7 @@
 
 
 #
-# Options defined in cinder.volume.drivers.lvm
+# Options defined in cinder.volume.drivers.lkeystonevm
 #
 
 # Name for the VG that will contain exported volumes (string
@@ -2261,7 +2261,7 @@
 #
 
 # Driver to use for volume creation (string value)
-#volume_driver=cinder.volume.drivers.lvm.LVMISCSIDriver
+#volume_driver=cinder.volume.drivers.lvm.LVMISCSIDriver ## FIXME: This is now in the databases sec
 
 # Timeout for creating the volume to migrate to when
 # performing volume migration (seconds) (integer value)
@@ -2283,7 +2283,11 @@
 # these different properties. (string value)
 #extra_capabilities={}
 
-
+[lvm]
+volume_driver = cinder.volume.drivers.lvm.LVMVolumeDriver
+volume_group = cinder-volumes
+iscsi_protocol = iscsi
+iscsi_helper = lioadm
 [BRCD_FABRIC_EXAMPLE]
 
 #
@@ -2357,6 +2361,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 +2443,19 @@
 #
 
 # Complete public Identity API endpoint. (string value)
-#auth_uri=<None>
+auth_uri = http://{{ CONTROLLER_HOST_ADDRESS }}:5000
+
+
+# Fields requested in kilo documentation but not included in
+# the docummented kilo config file
+auth_url = http://{{ CONTROLLER_HOST_ADDRESS }}:35357
+auth_plugin = password
+project_domain_id = default
+user_domain_id = default
+project_name = service
+username = {{ CINDER_SERVICE_USER }}
+password = {{ CINDER_SERVICE_PASSWORD }}
+
 
 # API version of the admin Identity API endpoint. (string
 # value)
@@ -2740,11 +2760,11 @@
 
 # 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
@@ -2753,10 +2773,10 @@
 #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
@@ -2809,10 +2829,17 @@
 #trace_sqlalchemy=false
 
 
-[DEFAULT]
 
+[oslo_concurrency]
 
-[keystone_authtoken]
+lock_path = /var/lock/cinder
+
+## Why are these here??
+
+#[DEFAULT]
+
+
+#[keystone_authtoken]
 
 #
 # From keystonemiddleware.auth_token
@@ -2962,7 +2989,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://onenode:35357
 
 # This option is deprecated and may be removed in a future release.
 # Single shared secret with the Keystone configuration used for
@@ -2972,10 +2999,10 @@
 #admin_token = <None>
 
 # Service username. (string value)
-#admin_user = <None>
+#admin_user = cinder
 
 # Service user password. (string value)
-#admin_password = <None>
+#admin_password = veryinsecure
 
 # Service tenant name. (string value)
-#admin_tenant_name = admin
+#admin_tenant_name = service