From 31305c442b84c610da53d376b0bc22e43f9a063c Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Tue, 14 Apr 2015 08:52:51 +0000 Subject: cinder: Modify configuration files Change-Id: I7febe7340f1107f5ff786b6a4e15dcfd676142b4 --- openstack/usr/share/openstack/cinder/cinder.conf | 54 ++++++++++++------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/openstack/usr/share/openstack/cinder/cinder.conf b/openstack/usr/share/openstack/cinder/cinder.conf index 30c3f15b..1ca21082 100644 --- a/openstack/usr/share/openstack/cinder/cinder.conf +++ b/openstack/usr/share/openstack/cinder/cinder.conf @@ -76,11 +76,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 @@ -89,12 +89,12 @@ #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) +# the RabbitMQ login method (string value) #rabbit_login_method=AMQPLAIN # The RabbitMQ virtual host. (string value) @@ -178,7 +178,7 @@ # 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 @@ -492,18 +492,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 @@ -597,7 +597,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 @@ -619,7 +619,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 @@ -699,7 +699,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) @@ -764,7 +764,7 @@ # Directory to use for lock files. Default to a temp directory # (string value) -#lock_path= +lock_path=/var/lock/cinder # @@ -848,7 +848,7 @@ # Use syslog for logging. Existing syslog format is DEPRECATED # during I, and will change in J to honor RFC5424. (boolean # value) -#use_syslog=false +use_syslog = True # (Optional) Enables or disables syslog rfc5424 format for # logging. If enabled, prefixes the MSG part of the syslog @@ -1031,7 +1031,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 port that the iSCSI daemon is listening on (integer # value) @@ -1044,7 +1044,7 @@ # The backend name for a given driver implementation (string # value) -#volume_backend_name= +volume_backend_name=LVM_iSCSI # Do we attach/detach volumes in cinder using multipath for # volume to image and image to volume transfers? (boolean @@ -1067,10 +1067,10 @@ # iSCSI target user-land tool to use. tgtadm is default, use # lioadm for LIO iSCSI support, iseradm for the ISER protocol, # 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 @@ -1565,7 +1565,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 @@ -2267,7 +2267,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) @@ -2368,7 +2368,7 @@ # Deprecated group/name - [DEFAULT]/sql_connection # Deprecated group/name - [DATABASE]/sql_connection # Deprecated group/name - [sql]/connection -#connection= +connection=postgresql://{{ CINDER_DB_USER }}:{{ CINDER_DB_PASSWORD }}@{{ CONTROLLER_HOST_ADDRESS }}/cinder # The SQLAlchemy connection string to use to connect to the # slave database. (string value) @@ -2557,12 +2557,12 @@ #auth_protocol=https # Complete public Identity API endpoint (string value) -#auth_uri= +auth_uri = http://{{ CONTROLLER_HOST_ADDRESS }}:5000/v2.0 # Complete admin Identity API endpoint. This should specify # the unversioned root endpoint e.g. https://localhost:35357/ # (string value) -#identity_uri= +identity_uri = http://{{ CONTROLLER_HOST_ADDRESS }}:35357 # API version of the admin Identity API endpoint (string # value) @@ -2590,14 +2590,14 @@ #admin_token= # Keystone account username (string value) -#admin_user= +admin_user={{ CINDER_SERVICE_USER }} # Keystone account password (string value) -#admin_password= +admin_password={{ CINDER_SERVICE_PASSWORD }} # Keystone service account tenant name to validate user tokens # (string value) -#admin_tenant_name=admin +admin_tenant_name=service # Env key for the swift cache (string value) #cache= -- cgit v1.2.1