diff options
author | 2016-12-19 11:06:36 +0800 | |
---|---|---|
committer | 2016-12-20 15:05:03 +0800 | |
commit | 819912d0379f6cd2b2693c2968576f7514a117c5 (patch) | |
tree | e24d274484fa1ec8976c9f1bd44f5ee6e445724b /deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf | |
parent | eb5dbdac42b1b7b775fbc1dc513376425a6898ff (diff) |
master only support newton
JIRA: COMPASS-513
Remove other roles and ppa, master only support newton.
Change-Id: I47ddb16baa25902c3e05cc7f9d0d6430f5dc7e00
Signed-off-by: liyuenan <liyuenan@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf')
-rw-r--r-- | deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf | 63 |
1 files changed, 41 insertions, 22 deletions
diff --git a/deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf b/deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf index 66d9948a..d428a078 100644 --- a/deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf +++ b/deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf @@ -1,3 +1,9 @@ +{% set memcached_servers = [] %} +{% for host in haproxy_hosts.values() %} +{% set _ = memcached_servers.append('%s:11211'% host) %} +{% endfor %} +{% set memcached_servers = memcached_servers|join(',') %} + [DEFAULT] rootwrap_config = /etc/cinder/rootwrap.conf api_paste_confg = /etc/cinder/api-paste.ini @@ -9,17 +15,13 @@ debug = {{ DEBUG }} auth_strategy = keystone state_path = /var/lib/cinder lock_path = /var/lock/cinder -notification_driver=cinder.openstack.common.notifier.rpc_notifier +notification_driver = cinder.openstack.common.notifier.rpc_notifier volumes_dir = /var/lib/cinder/volumes - -log_file=/var/log/cinder/cinder.log +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 }} @@ -28,8 +30,8 @@ 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 @@ -38,29 +40,46 @@ 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_port=3260 -iscsi_helper=tgtadm +iscsi_ip_address = {{ storage_controller_host }} +iscsi_port = 3260 +iscsi_helper = tgtadm -volumes_dir=/var/lib/cinder/volumes +volumes_dir = /var/lib/cinder/volumes +volume_driver = cinder.volume.drivers.lvm.LVMISCSIDriver -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 +memcached_servers = {{ memcached_servers }} +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 - [keymgr] encryption_auth_url=http://{{ internal_vip.ip }}:5000/v3 + +[oslo_messaging_rabbit] +rabbit_host = {{ rabbit_host }} +rabbit_port = 5672 +rabbit_userid = {{ RABBIT_USER }} +rabbit_password = {{ RABBIT_PASS }} + +[oslo_concurrency] +lock_path = /var/lib/cinder/tmp |