Browse Source

Update the deprecated group/name to Kilo release

For Kilo release, there are many deprecated group/name in conf files of openstack,
so we need to change the deprecated group/name to new group/name.

blueprint conf-section-update-for-kilo
Closes-bug: #1436170

Change-Id: Iec23f1b98fbf0c0772df7aba6ece9e0b32a85dc1
wenchma 4 years ago
parent
commit
226d27a12d
2 changed files with 228 additions and 167 deletions
  1. 50
    22
      spec/cinder_common_spec.rb
  2. 178
    145
      templates/default/cinder.conf.erb

+ 50
- 22
spec/cinder_common_spec.rb View File

@@ -167,7 +167,7 @@ describe 'openstack-block-storage::cinder-common' do
167 167
       context 'template contents' do
168 168
 
169 169
         context 'commonly named attributes' do
170
-          %w(debug verbose lock_path notification_driver
170
+          %w(debug verbose notification_driver
171 171
              storage_availability_zone quota_volumes quota_gigabytes quota_driver
172 172
              volume_name_template snapshot_name_template osapi_volume_workers
173 173
              use_default_quota_class quota_snapshots no_snapshot_gb_quota
@@ -192,6 +192,10 @@ describe 'openstack-block-storage::cinder-common' do
192 192
           end
193 193
         end
194 194
 
195
+        it 'has a lock_path attribute' do
196
+          expect(chef_run).to render_config_file(file.name).with_section_content('oslo_concurrency', %r(^lock_path=/var/lock/cinder$))
197
+        end
198
+
195 199
         context 'netapp driver' do
196 200
           # FIXME(galstrom21): this block needs to check all of the default
197 201
           #   netapp_* configuration options
@@ -220,12 +224,16 @@ describe 'openstack-block-storage::cinder-common' do
220 224
           end
221 225
         end
222 226
 
223
-        it 'has a sql_connection attribute' do
227
+        it 'has a db connection attribute' do
224 228
           allow_any_instance_of(Chef::Recipe).to receive(:db_uri)
225 229
             .with('block-storage', anything, '').and_return('sql_connection_value')
226 230
 
227
-          expect(chef_run).to render_file(file.name)
228
-            .with_content(/^sql_connection=sql_connection_value$/)
231
+          expect(chef_run).to render_config_file(file.name)
232
+            .with_section_content('database', /^connection=sql_connection_value$/)
233
+        end
234
+
235
+        it 'has a db backend attribute' do
236
+          expect(chef_run).to render_config_file(file.name).with_section_content('database', /^backend=sqlalchemy$/)
229 237
         end
230 238
 
231 239
         it 'has a volume_driver attribute' do
@@ -287,6 +295,13 @@ describe 'openstack-block-storage::cinder-common' do
287 295
           it 'has osapi_volume_listen_port set' do
288 296
             expect(chef_run).to render_file(file.name).with_content(/^osapi_volume_listen_port=8776$/)
289 297
           end
298
+
299
+          it 'has default api version set' do
300
+            [/^enable_v1_api=false$/,
301
+             /^enable_v2_api=true$/].each do |line|
302
+              expect(chef_run).to render_config_file(file.name).with_section_content('DEFAULT', line)
303
+            end
304
+          end
290 305
         end
291 306
 
292 307
         it 'has a rpc_backend attribute' do
@@ -297,10 +312,7 @@ describe 'openstack-block-storage::cinder-common' do
297 312
         it 'has default RPC/AMQP options set' do
298 313
           [/^rpc_backend=cinder.openstack.common.rpc.impl_kombu$/,
299 314
            /^rpc_thread_pool_size=64$/,
300
-           /^rpc_conn_pool_size=30$/,
301
-           /^rpc_response_timeout=60$/,
302
-           /^amqp_durable_queues=false$/,
303
-           /^amqp_auto_delete=false$/].each do |line|
315
+           /^rpc_response_timeout=60$/].each do |line|
304 316
             expect(chef_run).to render_file(file.name).with_content(line)
305 317
           end
306 318
         end
@@ -310,6 +322,14 @@ describe 'openstack-block-storage::cinder-common' do
310 322
             node.set['openstack']['mq']['block-storage']['service_type'] = 'rabbitmq'
311 323
           end
312 324
 
325
+          it 'has default RPC/AMQP options set' do
326
+            [/^rpc_conn_pool_size=30$/,
327
+             /^amqp_durable_queues=false$/,
328
+             /^amqp_auto_delete=false$/].each do |line|
329
+              expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', line)
330
+            end
331
+          end
332
+
313 333
           context 'ha attributes' do
314 334
             before do
315 335
               node.set['openstack']['mq']['block-storage']['rabbit']['ha'] = true
@@ -319,12 +339,12 @@ describe 'openstack-block-storage::cinder-common' do
319 339
               allow_any_instance_of(Chef::Recipe).to receive(:rabbit_servers)
320 340
                 .and_return('rabbit_servers_value')
321 341
 
322
-              expect(chef_run).to render_file(file.name).with_content(/^rabbit_hosts=rabbit_servers_value$/)
342
+              expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', /^rabbit_hosts=rabbit_servers_value$/)
323 343
             end
324 344
 
325 345
             %w(host port).each do |attr|
326 346
               it "does not have rabbit_#{attr} attribute" do
327
-                expect(chef_run).not_to render_file(file.name).with_content(/^rabbit_#{attr}=/)
347
+                expect(chef_run).not_to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', /^rabbit_#{attr}=/)
328 348
               end
329 349
             end
330 350
           end
@@ -337,40 +357,40 @@ describe 'openstack-block-storage::cinder-common' do
337 357
             %w(host port).each do |attr|
338 358
               it "has rabbit_#{attr} attribute" do
339 359
                 node.set['openstack']['mq']['block-storage']['rabbit'][attr] = "rabbit_#{attr}_value"
340
-                expect(chef_run).to render_file(file.name).with_content(/^rabbit_#{attr}=rabbit_#{attr}_value$/)
360
+                expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', /^rabbit_#{attr}=rabbit_#{attr}_value$/)
341 361
               end
342 362
             end
343 363
 
344 364
             it 'does not have a rabbit_hosts attribute' do
345
-              expect(chef_run).not_to render_file(file.name).with_content(/^rabbit_hosts=/)
365
+              expect(chef_run).not_to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', /^rabbit_hosts=/)
346 366
             end
347 367
           end
348 368
 
349 369
           %w(use_ssl userid).each do |attr|
350 370
             it "has rabbit_#{attr}" do
351 371
               node.set['openstack']['mq']['block-storage']['rabbit'][attr] = "rabbit_#{attr}_value"
352
-              expect(chef_run).to render_file(file.name).with_content(/^rabbit_#{attr}=rabbit_#{attr}_value$/)
372
+              expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', /^rabbit_#{attr}=rabbit_#{attr}_value$/)
353 373
             end
354 374
           end
355 375
 
356 376
           it 'has rabbit_password' do
357
-            expect(chef_run).to render_file(file.name).with_content(/^rabbit_password=#{test_pass}$/)
377
+            expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', /^rabbit_password=#{test_pass}$/)
358 378
           end
359 379
 
360 380
           it 'has rabbit_virtual_host' do
361 381
             node.set['openstack']['mq']['block-storage']['rabbit']['vhost'] = 'vhost_value'
362
-            expect(chef_run).to render_file(file.name).with_content(/^rabbit_virtual_host=vhost_value$/)
382
+            expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', /^rabbit_virtual_host=vhost_value$/)
363 383
           end
364 384
 
365 385
           it 'does not have kombu ssl version set' do
366
-            expect(chef_run).not_to render_config_file(file.name).with_section_content('DEFAULT', /^kombu_ssl_version=TLSv1.2$/)
386
+            expect(chef_run).not_to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', /^kombu_ssl_version=TLSv1.2$/)
367 387
           end
368 388
 
369 389
           it 'sets kombu ssl version' do
370 390
             node.set['openstack']['mq']['block-storage']['rabbit']['use_ssl'] = true
371 391
             node.set['openstack']['mq']['block-storage']['rabbit']['kombu_ssl_version'] = 'TLSv1.2'
372 392
 
373
-            expect(chef_run).to render_config_file(file.name).with_section_content('DEFAULT', /^kombu_ssl_version=TLSv1.2$/)
393
+            expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', /^kombu_ssl_version=TLSv1.2$/)
374 394
           end
375 395
         end
376 396
 
@@ -379,31 +399,39 @@ describe 'openstack-block-storage::cinder-common' do
379 399
             node.set['openstack']['mq']['block-storage']['service_type'] = 'qpid'
380 400
           end
381 401
 
402
+          it 'has default RPC/AMQP options set' do
403
+            [/^rpc_conn_pool_size=30$/,
404
+             /^amqp_durable_queues=false$/,
405
+             /^amqp_auto_delete=false$/].each do |line|
406
+              expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_qpid', line)
407
+            end
408
+          end
409
+
382 410
           %w(port username sasl_mechanisms reconnect reconnect_timeout reconnect_limit
383 411
              reconnect_interval_min reconnect_interval_max reconnect_interval heartbeat protocol
384 412
              tcp_nodelay).each do |attr|
385 413
             it "has qpid_#{attr} attribute" do
386 414
               node.set['openstack']['mq']['block-storage']['qpid'][attr] = "qpid_#{attr}_value"
387
-              expect(chef_run).to render_file(file.name).with_content(/^qpid_#{attr}=qpid_#{attr}_value$/)
415
+              expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_qpid', /^qpid_#{attr}=qpid_#{attr}_value$/)
388 416
             end
389 417
           end
390 418
 
391 419
           it 'has qpid_hostname' do
392 420
             node.set['openstack']['mq']['block-storage']['qpid']['host'] = 'qpid_host_value'
393
-            expect(chef_run).to render_file(file.name).with_content(/^qpid_hostname=qpid_host_value$/)
421
+            expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_qpid', /^qpid_hostname=qpid_host_value$/)
394 422
           end
395 423
 
396 424
           it 'has qpid_password' do
397
-            expect(chef_run).to render_file(file.name).with_content(/^qpid_password=#{test_pass}$/)
425
+            expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_qpid', /^qpid_password=#{test_pass}$/)
398 426
           end
399 427
 
400 428
           it 'has default qpid topology version' do
401
-            expect(chef_run).to render_file(file.name).with_content(/^qpid_topology_version=1$/)
429
+            expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_qpid', /^qpid_topology_version=1$/)
402 430
           end
403 431
 
404 432
           it 'has qpid notification_topics' do
405 433
             node.set['openstack']['mq']['block-storage']['qpid']['notification_topic'] = 'qpid_notification_topic_value'
406
-            expect(chef_run).to render_file(file.name).with_content(/^notification_topics=qpid_notification_topic_value$/)
434
+            expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_qpid', /^notification_topics=qpid_notification_topic_value$/)
407 435
           end
408 436
         end
409 437
 

+ 178
- 145
templates/default/cinder.conf.erb View File

@@ -10,8 +10,6 @@ debug=<%= node["openstack"]["block-storage"]["debug"] %>
10 10
 verbose=<%= node["openstack"]["block-storage"]["verbose"] %>
11 11
 #### (BoolOpt) Print more verbose output
12 12
 
13
-# lock_path
14
-lock_path=<%= node["openstack"]["block-storage"]["lock_path"] %>
15 13
 notification_driver=<%= node["openstack"]["block-storage"]["notification_driver"] %>
16 14
 
17 15
 # log_config=<None>
@@ -51,18 +49,15 @@ log_file = /var/log/cinder/cinder.log
51 49
 #### (StrOpt) Virtualization api connection type : libvirt, xenapi, or
52 50
 ####          fake
53 51
 
54
-sql_connection=<%= @sql_connection %>
55
-# sql_connection=sqlite:///$state_path/$sqlite_db
56
-#### (StrOpt) The SQLAlchemy connection string used to connect to the
57
-####          database
58
-
59
-# sql_connection_debug=0
60
-#### (IntOpt) Verbosity of SQL debugging information. 0=None,
61
-####          100=Everything
62
-
63 52
 # api_paste_config=api-paste.ini
64 53
 #### (StrOpt) File name for the paste.deploy config for cinder-api
65 54
 
55
+# DEPRECATED: Deploy v1 of the Cinder API. (boolean value)
56
+enable_v1_api=false
57
+
58
+# Deploy v2 of the Cinder API. (boolean value)
59
+enable_v2_api=true
60
+
66 61
 # pybasedir=/usr/lib/python/site-packages
67 62
 #### (StrOpt) Directory where the cinder python module is installed
68 63
 
@@ -276,9 +271,6 @@ osapi_volume_workers=<%= node["openstack"]["block-storage"]["osapi_volume_worker
276 271
 
277 272
 ######## defined in cinder.db.api ########
278 273
 
279
-db_backend=sqlalchemy
280
-#### (StrOpt) The backend to use for db
281
-
282 274
 # enable_new_services=true
283 275
 #### (BoolOpt) Services to be added to the available pool on create
284 276
 
@@ -355,15 +347,9 @@ control_exchange=<%=node['openstack']['block-storage']['control_exchange']%>
355 347
 #### (StrOpt) AMQP exchange to connect to if using RabbitMQ or Qpid
356 348
 
357 349
 rpc_thread_pool_size=<%= node["openstack"]["block-storage"]["rpc_thread_pool_size"] %>
358
-
359 350
 #### (IntOpt) Size of RPC thread pool
360 351
 
361
-rpc_conn_pool_size=<%= node["openstack"]["block-storage"]["rpc_conn_pool_size"] %>
362
-
363
-#### (IntOpt) Size of RPC connection pool
364
-
365 352
 rpc_response_timeout=<%= node["openstack"]["block-storage"]["rpc_response_timeout"] %>
366
-
367 353
 #### (IntOpt) Seconds to wait for a response from call or multicall
368 354
 
369 355
 # rpc_cast_timeout=30
@@ -374,131 +360,6 @@ rpc_response_timeout=<%= node["openstack"]["block-storage"]["rpc_response_timeou
374 360
 #### (ListOpt) Modules of exceptions that are permitted to be recreatedupon
375 361
 ####           receiving exception data from an rpc call.
376 362
 
377
-# from oslo/messaging/_drivers/amqp.py
378
-amqp_durable_queues=<%= node['openstack']['mq']['block-storage']['durable_queues'] %>
379
-amqp_auto_delete=<%= node['openstack']['mq']['block-storage']['auto_delete'] %>
380
-
381
-<% if @mq_service_type == "rabbitmq"  %>
382
-
383
-# fake_rabbit=false
384
-#### (BoolOpt) If passed, use a fake RabbitMQ provider
385
-
386
-######## defined in cinder.openstack.common.rpc.impl_kombu ########
387
-
388
-<% if node["openstack"]["mq"]["block-storage"]["rabbit"]["use_ssl"] && node["openstack"]["mq"]["block-storage"]["rabbit"]["kombu_ssl_version"] %>
389
-kombu_ssl_version=<%= node["openstack"]["mq"]["block-storage"]["rabbit"]["kombu_ssl_version"] %>
390
-#### (StrOpt) SSL version to use (valid only if SSL enabled)
391
-<% end -%>
392
-
393
-# kombu_ssl_keyfile=
394
-#### (StrOpt) SSL key file (valid only if SSL enabled)
395
-
396
-# kombu_ssl_certfile=
397
-#### (StrOpt) SSL cert file (valid only if SSL enabled)
398
-
399
-# kombu_ssl_ca_certs=
400
-#### (StrOpt) SSL certification authority file (valid only if SSL enabled)
401
-
402
-<% if node["openstack"]["mq"]["block-storage"]["rabbit"]["ha"] -%>
403
-rabbit_hosts=<%= @rabbit_hosts %>
404
-#### (ListOpt) RabbitMQ HA cluster host:port pairs
405
-
406
-# rabbit_durable_queues=false
407
-#### (BoolOpt) use durable queues in RabbitMQ
408
-
409
-rabbit_ha_queues=True
410
-#### (BoolOpt) use H/A queues in RabbitMQ (x-ha-policy: all).You need to
411
-####           wipe RabbitMQ database when changing this option.
412
-<% else -%>
413
-rabbit_host=<%= node["openstack"]["mq"]["block-storage"]["rabbit"]["host"] %>
414
-#### (StrOpt) The RabbitMQ broker address where a single node is used
415
-
416
-rabbit_port=<%= node["openstack"]["mq"]["block-storage"]["rabbit"]["port"] %>
417
-#### (IntOpt) The RabbitMQ broker port where a single node is used
418
-<% end -%>
419
-
420
-rabbit_use_ssl=<%= node["openstack"]["mq"]["block-storage"]["rabbit"]["use_ssl"] %>
421
-#### (BoolOpt) connect over SSL for RabbitMQ
422
-
423
-rabbit_userid=<%= node["openstack"]["mq"]["block-storage"]["rabbit"]["userid"] %>
424
-#### (StrOpt) the RabbitMQ userid
425
-
426
-rabbit_password=<%= @mq_password %>
427
-#### (StrOpt) the RabbitMQ password
428
-
429
-rabbit_virtual_host=<%= node["openstack"]["mq"]["block-storage"]["rabbit"]["vhost"] %>
430
-#### (StrOpt) the RabbitMQ virtual host
431
-
432
-notification_topics=<%= node["openstack"]["mq"]["block-storage"]["rabbit"]["notification_topic"] %>
433
-#### (ListOpt) AMQP topic used for openstack notifications
434
-
435
-# rabbit_retry_interval=1
436
-#### (IntOpt) how frequently to retry connecting with RabbitMQ
437
-
438
-# rabbit_retry_backoff=2
439
-#### (IntOpt) how long to backoff for between retries when connecting to
440
-####          RabbitMQ
441
-
442
-# rabbit_max_retries=0
443
-#### (IntOpt) maximum retries with trying to connect to RabbitMQ (the
444
-####          default of 0 implies an infinite retry count)
445
-
446
-<% end %>
447
-
448
-
449
-<% if @mq_service_type == "qpid"  %>
450
-
451
-##### QPID #####
452
-######## defined in cinder.openstack.common.rpc.impl_qpid ########
453
-qpid_hostname=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["host"] %>
454
-#### (StrOpt) Qpid broker hostname
455
-
456
-qpid_port=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["port"] %>
457
-#### (StrOpt) Qpid broker port
458
-
459
-qpid_username=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["username"] %>
460
-#### (StrOpt) Username for qpid connection
461
-
462
-qpid_password=<%= @mq_password %>
463
-#### (StrOpt) Password for qpid connection
464
-
465
-qpid_sasl_mechanisms=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["sasl_mechanisms"] %>
466
-#### (StrOpt) Space separated list of SASL mechanisms to use for auth
467
-
468
-qpid_reconnect=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["reconnect"] %>
469
-#### (BoolOpt) Automatically reconnect
470
-
471
-qpid_reconnect_timeout=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["reconnect_timeout"] %>
472
-#### (IntOpt) Reconnection timeout in seconds
473
-
474
-qpid_reconnect_limit=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["reconnect_limit"] %>
475
-#### (IntOpt) Max reconnections before giving up
476
-
477
-qpid_reconnect_interval_min=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["reconnect_interval_min"] %>
478
-#### (IntOpt) Minimum seconds between reconnection attempts
479
-
480
-qpid_reconnect_interval_max=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["reconnect_interval_max"] %>
481
-#### (IntOpt) Maximum seconds between reconnection attempts
482
-
483
-qpid_reconnect_interval=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["reconnect_interval"] %>
484
-#### (IntOpt) Equivalent to setting max and min to the same value
485
-
486
-qpid_heartbeat=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["heartbeat"] %>
487
-#### (IntOpt) Seconds between connection keepalive heartbeats
488
-
489
-qpid_protocol=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["protocol"] %>
490
-#### (StrOpt) Transport to use, either 'tcp' or 'ssl'
491
-
492
-qpid_tcp_nodelay=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["tcp_nodelay"] %>
493
-#### (BoolOpt) Disable Nagle algorithm
494
-
495
-qpid_topology_version=<%= node['openstack']['mq']['block-storage']['qpid']['topology_version'] %>
496
-#### (IntOpt) See oslo/messaging/_drivers/impl_qpid.py for details
497
-
498
-notification_topics=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["notification_topic"] %>
499
-#### (ListOpt) AMQP topic used for openstack notifications
500
-<% end %>
501
-
502 363
 
503 364
 ######## defined in cinder.openstack.common.rpc.impl_zmq ########
504 365
 
@@ -1074,6 +935,25 @@ enabled_backends = <%= @multi_backend_sections.keys.join(',') %>
1074 935
 <% end %>
1075 936
 <% end %>
1076 937
 
938
+[database]
939
+
940
+#
941
+# Options defined in oslo.db
942
+#
943
+
944
+backend=sqlalchemy
945
+#### (StrOpt) The backend to use for db
946
+
947
+connection=<%= @sql_connection %>
948
+# sql_connection=sqlite:///$state_path/$sqlite_db
949
+#### (StrOpt) The SQLAlchemy connection string used to connect to the
950
+####          database
951
+
952
+# sql_connection_debug=0
953
+#### (IntOpt) Verbosity of SQL debugging information. 0=None,
954
+####          100=Everything
955
+
956
+
1077 957
 [keystone_authtoken]
1078 958
 
1079 959
 #
@@ -1227,3 +1107,156 @@ memcache_secret_key = <%= node['openstack']['block-storage']['api']['auth']['mem
1227 1107
 # (list value)
1228 1108
 #hash_algorithms=md5
1229 1109
 hash_algorithms = <%= node['openstack']['block-storage']['api']['auth']['hash_algorithms'] %>
1110
+
1111
+
1112
+[oslo_concurrency]
1113
+
1114
+# lock_path
1115
+lock_path=<%= node["openstack"]["block-storage"]["lock_path"] %>
1116
+
1117
+
1118
+<% if @mq_service_type == "qpid"  %>
1119
+[oslo_messaging_qpid]
1120
+
1121
+#
1122
+# From oslo.messaging
1123
+#
1124
+
1125
+# from oslo/messaging/_drivers/amqp.py
1126
+amqp_durable_queues=<%= node['openstack']['mq']['block-storage']['durable_queues'] %>
1127
+amqp_auto_delete=<%= node['openstack']['mq']['block-storage']['auto_delete'] %>
1128
+
1129
+rpc_conn_pool_size=<%= node["openstack"]["block-storage"]["rpc_conn_pool_size"] %>
1130
+
1131
+#### (IntOpt) Size of RPC connection pool
1132
+
1133
+##### QPID #####
1134
+######## defined in cinder.openstack.common.rpc.impl_qpid ########
1135
+qpid_hostname=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["host"] %>
1136
+#### (StrOpt) Qpid broker hostname
1137
+
1138
+qpid_port=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["port"] %>
1139
+#### (StrOpt) Qpid broker port
1140
+
1141
+qpid_username=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["username"] %>
1142
+#### (StrOpt) Username for qpid connection
1143
+
1144
+qpid_password=<%= @mq_password %>
1145
+#### (StrOpt) Password for qpid connection
1146
+
1147
+qpid_sasl_mechanisms=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["sasl_mechanisms"] %>
1148
+#### (StrOpt) Space separated list of SASL mechanisms to use for auth
1149
+
1150
+qpid_reconnect=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["reconnect"] %>
1151
+#### (BoolOpt) Automatically reconnect
1152
+
1153
+qpid_reconnect_timeout=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["reconnect_timeout"] %>
1154
+#### (IntOpt) Reconnection timeout in seconds
1155
+
1156
+qpid_reconnect_limit=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["reconnect_limit"] %>
1157
+#### (IntOpt) Max reconnections before giving up
1158
+
1159
+qpid_reconnect_interval_min=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["reconnect_interval_min"] %>
1160
+#### (IntOpt) Minimum seconds between reconnection attempts
1161
+
1162
+qpid_reconnect_interval_max=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["reconnect_interval_max"] %>
1163
+#### (IntOpt) Maximum seconds between reconnection attempts
1164
+
1165
+qpid_reconnect_interval=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["reconnect_interval"] %>
1166
+#### (IntOpt) Equivalent to setting max and min to the same value
1167
+
1168
+qpid_heartbeat=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["heartbeat"] %>
1169
+#### (IntOpt) Seconds between connection keepalive heartbeats
1170
+
1171
+qpid_protocol=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["protocol"] %>
1172
+#### (StrOpt) Transport to use, either 'tcp' or 'ssl'
1173
+
1174
+qpid_tcp_nodelay=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["tcp_nodelay"] %>
1175
+#### (BoolOpt) Disable Nagle algorithm
1176
+
1177
+qpid_topology_version=<%= node['openstack']['mq']['block-storage']['qpid']['topology_version'] %>
1178
+#### (IntOpt) See oslo/messaging/_drivers/impl_qpid.py for details
1179
+
1180
+notification_topics=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["notification_topic"] %>
1181
+#### (ListOpt) AMQP topic used for openstack notifications
1182
+<% end %>
1183
+
1184
+<% if @mq_service_type == "rabbitmq"  %>
1185
+[oslo_messaging_rabbit]
1186
+
1187
+#
1188
+# From oslo.messaging
1189
+#
1190
+
1191
+# from oslo/messaging/_drivers/amqp.py
1192
+amqp_durable_queues=<%= node['openstack']['mq']['block-storage']['durable_queues'] %>
1193
+amqp_auto_delete=<%= node['openstack']['mq']['block-storage']['auto_delete'] %>
1194
+
1195
+rpc_conn_pool_size=<%= node["openstack"]["block-storage"]["rpc_conn_pool_size"] %>
1196
+
1197
+#### (IntOpt) Size of RPC connection pool
1198
+
1199
+# fake_rabbit=false
1200
+#### (BoolOpt) If passed, use a fake RabbitMQ provider
1201
+
1202
+######## defined in cinder.openstack.common.rpc.impl_kombu ########
1203
+
1204
+<% if node["openstack"]["mq"]["block-storage"]["rabbit"]["use_ssl"] && node["openstack"]["mq"]["block-storage"]["rabbit"]["kombu_ssl_version"] %>
1205
+kombu_ssl_version=<%= node["openstack"]["mq"]["block-storage"]["rabbit"]["kombu_ssl_version"] %>
1206
+#### (StrOpt) SSL version to use (valid only if SSL enabled)
1207
+<% end -%>
1208
+
1209
+# kombu_ssl_keyfile=
1210
+#### (StrOpt) SSL key file (valid only if SSL enabled)
1211
+
1212
+# kombu_ssl_certfile=
1213
+#### (StrOpt) SSL cert file (valid only if SSL enabled)
1214
+
1215
+# kombu_ssl_ca_certs=
1216
+#### (StrOpt) SSL certification authority file (valid only if SSL enabled)
1217
+
1218
+<% if node["openstack"]["mq"]["block-storage"]["rabbit"]["ha"] -%>
1219
+rabbit_hosts=<%= @rabbit_hosts %>
1220
+#### (ListOpt) RabbitMQ HA cluster host:port pairs
1221
+
1222
+# rabbit_durable_queues=false
1223
+#### (BoolOpt) use durable queues in RabbitMQ
1224
+
1225
+rabbit_ha_queues=True
1226
+#### (BoolOpt) use H/A queues in RabbitMQ (x-ha-policy: all).You need to
1227
+####           wipe RabbitMQ database when changing this option.
1228
+<% else -%>
1229
+rabbit_host=<%= node["openstack"]["mq"]["block-storage"]["rabbit"]["host"] %>
1230
+#### (StrOpt) The RabbitMQ broker address where a single node is used
1231
+
1232
+rabbit_port=<%= node["openstack"]["mq"]["block-storage"]["rabbit"]["port"] %>
1233
+#### (IntOpt) The RabbitMQ broker port where a single node is used
1234
+<% end -%>
1235
+
1236
+rabbit_use_ssl=<%= node["openstack"]["mq"]["block-storage"]["rabbit"]["use_ssl"] %>
1237
+#### (BoolOpt) connect over SSL for RabbitMQ
1238
+
1239
+rabbit_userid=<%= node["openstack"]["mq"]["block-storage"]["rabbit"]["userid"] %>
1240
+#### (StrOpt) the RabbitMQ userid
1241
+
1242
+rabbit_password=<%= @mq_password %>
1243
+#### (StrOpt) the RabbitMQ password
1244
+
1245
+rabbit_virtual_host=<%= node["openstack"]["mq"]["block-storage"]["rabbit"]["vhost"] %>
1246
+#### (StrOpt) the RabbitMQ virtual host
1247
+
1248
+notification_topics=<%= node["openstack"]["mq"]["block-storage"]["rabbit"]["notification_topic"] %>
1249
+#### (ListOpt) AMQP topic used for openstack notifications
1250
+
1251
+# rabbit_retry_interval=1
1252
+#### (IntOpt) how frequently to retry connecting with RabbitMQ
1253
+
1254
+# rabbit_retry_backoff=2
1255
+#### (IntOpt) how long to backoff for between retries when connecting to
1256
+####          RabbitMQ
1257
+
1258
+# rabbit_max_retries=0
1259
+#### (IntOpt) maximum retries with trying to connect to RabbitMQ (the
1260
+####          default of 0 implies an infinite retry count)
1261
+
1262
+<% end %>

Loading…
Cancel
Save