From 819912d0379f6cd2b2693c2968576f7514a117c5 Mon Sep 17 00:00:00 2001 From: liyuenan Date: Mon, 19 Dec 2016 11:06:36 +0800 Subject: master only support newton JIRA: COMPASS-513 Remove other roles and ppa, master only support newton. Change-Id: I47ddb16baa25902c3e05cc7f9d0d6430f5dc7e00 Signed-off-by: liyuenan --- .../roles/cinder-volume/templates/cinder.conf | 45 ++++++++++++++-------- 1 file changed, 29 insertions(+), 16 deletions(-) (limited to 'deploy/adapters/ansible/roles/cinder-volume/templates/cinder.conf') diff --git a/deploy/adapters/ansible/roles/cinder-volume/templates/cinder.conf b/deploy/adapters/ansible/roles/cinder-volume/templates/cinder.conf index 0660cba9..e7946b5c 100644 --- a/deploy/adapters/ansible/roles/cinder-volume/templates/cinder.conf +++ b/deploy/adapters/ansible/roles/cinder-volume/templates/cinder.conf @@ -10,25 +10,22 @@ state_path = /var/lib/cinder lock_path = /var/lib/cinder/tmp notification_driver=cinder.openstack.common.notifier.rpc_notifier volumes_dir = /var/lib/cinder/volumes - +transport_url = rabbit://{{ RABBIT_USER }}:{{ RABBIT_PASS }}@{{ rabbit_host }} log_file=/var/log/cinder/cinder.log control_exchange = cinder rpc_backend = rabbit -rabbit_host = {{ rabbit_host }} -rabbit_port = 5672 -rabbit_userid = {{ RABBIT_USER }} -rabbit_password = {{ RABBIT_PASS }} my_ip = {{ storage_controller_host }} glance_host = {{ internal_vip.ip }} glance_port = 9292 +glance_api_servers = http://{{ internal_vip.ip }}:9292 api_rate_limit = False storage_availability_zone = nova quota_volumes = 10 -quota_gigabytes=1000 -quota_driver=cinder.quota.DbQuotaDriver +quota_gigabytes = 1000 +quota_driver = cinder.quota.DbQuotaDriver osapi_volume_listen = {{ storage_controller_host }} osapi_volume_listen_port = 8776 @@ -37,26 +34,42 @@ db_backend = sqlalchemy volume_name_template = volume-%s snapshot_name_template = snapshot-%s -max_gigabytes=10000 +max_gigabytes = 10000 -volume_clear=zero -volume_clear_size=10 +volume_clear = zero +volume_clear_size = 10 -iscsi_ip_address={{ storage_controller_host }} +iscsi_ip_address = {{ storage_controller_host }} iscsi_port=3260 iscsi_helper=tgtadm volumes_dir=/var/lib/cinder/volumes - volume_driver=cinder.volume.drivers.lvm.LVMISCSIDriver +[database] +connection = mysql://cinder:{{ CINDER_DBPASS }}@{{ db_host }}/cinder +idle_timeout = 30 + [keystone_authtoken] -auth_uri = http://{{ internal_vip.ip }}:5000/v3 +auth_uri = http://{{ internal_vip.ip }}:5000 +auth_url = http://{{ internal_vip.ip }}:35357 +auth_type = password +project_domain_name = default +user_domain_name = default +project_name = service +username = cinder +password = {{ CINDER_PASS }} + identity_uri = http://{{ internal_vip.ip }}:35357 admin_tenant_name = service admin_user = cinder admin_password = {{ CINDER_PASS }} -[database] -connection = mysql://cinder:{{ CINDER_DBPASS }}@{{ db_host }}/cinder -idle_timeout = 30 +[lvm] +volume_driver = cinder.volume.drivers.lvm.LVMVolumeDriver +volume_group = cinder-volumes +iscsi_protocol = iscsi +iscsi_helper = tgtadm + +[oslo_concurrency] +lock_path = /var/lib/cinder/tmp -- cgit 1.2.3-korg