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
This commit is contained in:
parent
6b59429a66
commit
226d27a12d
@ -167,7 +167,7 @@ describe 'openstack-block-storage::cinder-common' do
|
|||||||
context 'template contents' do
|
context 'template contents' do
|
||||||
|
|
||||||
context 'commonly named attributes' do
|
context 'commonly named attributes' do
|
||||||
%w(debug verbose lock_path notification_driver
|
%w(debug verbose notification_driver
|
||||||
storage_availability_zone quota_volumes quota_gigabytes quota_driver
|
storage_availability_zone quota_volumes quota_gigabytes quota_driver
|
||||||
volume_name_template snapshot_name_template osapi_volume_workers
|
volume_name_template snapshot_name_template osapi_volume_workers
|
||||||
use_default_quota_class quota_snapshots no_snapshot_gb_quota
|
use_default_quota_class quota_snapshots no_snapshot_gb_quota
|
||||||
@ -192,6 +192,10 @@ describe 'openstack-block-storage::cinder-common' do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'has a lock_path attribute' do
|
||||||
|
expect(chef_run).to render_config_file(file.name).with_section_content('oslo_concurrency', %r(^lock_path=/var/lock/cinder$))
|
||||||
|
end
|
||||||
|
|
||||||
context 'netapp driver' do
|
context 'netapp driver' do
|
||||||
# FIXME(galstrom21): this block needs to check all of the default
|
# FIXME(galstrom21): this block needs to check all of the default
|
||||||
# netapp_* configuration options
|
# netapp_* configuration options
|
||||||
@ -220,12 +224,16 @@ describe 'openstack-block-storage::cinder-common' do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'has a sql_connection attribute' do
|
it 'has a db connection attribute' do
|
||||||
allow_any_instance_of(Chef::Recipe).to receive(:db_uri)
|
allow_any_instance_of(Chef::Recipe).to receive(:db_uri)
|
||||||
.with('block-storage', anything, '').and_return('sql_connection_value')
|
.with('block-storage', anything, '').and_return('sql_connection_value')
|
||||||
|
|
||||||
expect(chef_run).to render_file(file.name)
|
expect(chef_run).to render_config_file(file.name)
|
||||||
.with_content(/^sql_connection=sql_connection_value$/)
|
.with_section_content('database', /^connection=sql_connection_value$/)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'has a db backend attribute' do
|
||||||
|
expect(chef_run).to render_config_file(file.name).with_section_content('database', /^backend=sqlalchemy$/)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'has a volume_driver attribute' do
|
it 'has a volume_driver attribute' do
|
||||||
@ -287,6 +295,13 @@ describe 'openstack-block-storage::cinder-common' do
|
|||||||
it 'has osapi_volume_listen_port set' do
|
it 'has osapi_volume_listen_port set' do
|
||||||
expect(chef_run).to render_file(file.name).with_content(/^osapi_volume_listen_port=8776$/)
|
expect(chef_run).to render_file(file.name).with_content(/^osapi_volume_listen_port=8776$/)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'has default api version set' do
|
||||||
|
[/^enable_v1_api=false$/,
|
||||||
|
/^enable_v2_api=true$/].each do |line|
|
||||||
|
expect(chef_run).to render_config_file(file.name).with_section_content('DEFAULT', line)
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'has a rpc_backend attribute' do
|
it 'has a rpc_backend attribute' do
|
||||||
@ -297,10 +312,7 @@ describe 'openstack-block-storage::cinder-common' do
|
|||||||
it 'has default RPC/AMQP options set' do
|
it 'has default RPC/AMQP options set' do
|
||||||
[/^rpc_backend=cinder.openstack.common.rpc.impl_kombu$/,
|
[/^rpc_backend=cinder.openstack.common.rpc.impl_kombu$/,
|
||||||
/^rpc_thread_pool_size=64$/,
|
/^rpc_thread_pool_size=64$/,
|
||||||
/^rpc_conn_pool_size=30$/,
|
/^rpc_response_timeout=60$/].each do |line|
|
||||||
/^rpc_response_timeout=60$/,
|
|
||||||
/^amqp_durable_queues=false$/,
|
|
||||||
/^amqp_auto_delete=false$/].each do |line|
|
|
||||||
expect(chef_run).to render_file(file.name).with_content(line)
|
expect(chef_run).to render_file(file.name).with_content(line)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -310,6 +322,14 @@ describe 'openstack-block-storage::cinder-common' do
|
|||||||
node.set['openstack']['mq']['block-storage']['service_type'] = 'rabbitmq'
|
node.set['openstack']['mq']['block-storage']['service_type'] = 'rabbitmq'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'has default RPC/AMQP options set' do
|
||||||
|
[/^rpc_conn_pool_size=30$/,
|
||||||
|
/^amqp_durable_queues=false$/,
|
||||||
|
/^amqp_auto_delete=false$/].each do |line|
|
||||||
|
expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', line)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
context 'ha attributes' do
|
context 'ha attributes' do
|
||||||
before do
|
before do
|
||||||
node.set['openstack']['mq']['block-storage']['rabbit']['ha'] = true
|
node.set['openstack']['mq']['block-storage']['rabbit']['ha'] = true
|
||||||
@ -319,12 +339,12 @@ describe 'openstack-block-storage::cinder-common' do
|
|||||||
allow_any_instance_of(Chef::Recipe).to receive(:rabbit_servers)
|
allow_any_instance_of(Chef::Recipe).to receive(:rabbit_servers)
|
||||||
.and_return('rabbit_servers_value')
|
.and_return('rabbit_servers_value')
|
||||||
|
|
||||||
expect(chef_run).to render_file(file.name).with_content(/^rabbit_hosts=rabbit_servers_value$/)
|
expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', /^rabbit_hosts=rabbit_servers_value$/)
|
||||||
end
|
end
|
||||||
|
|
||||||
%w(host port).each do |attr|
|
%w(host port).each do |attr|
|
||||||
it "does not have rabbit_#{attr} attribute" do
|
it "does not have rabbit_#{attr} attribute" do
|
||||||
expect(chef_run).not_to render_file(file.name).with_content(/^rabbit_#{attr}=/)
|
expect(chef_run).not_to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', /^rabbit_#{attr}=/)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -337,40 +357,40 @@ describe 'openstack-block-storage::cinder-common' do
|
|||||||
%w(host port).each do |attr|
|
%w(host port).each do |attr|
|
||||||
it "has rabbit_#{attr} attribute" do
|
it "has rabbit_#{attr} attribute" do
|
||||||
node.set['openstack']['mq']['block-storage']['rabbit'][attr] = "rabbit_#{attr}_value"
|
node.set['openstack']['mq']['block-storage']['rabbit'][attr] = "rabbit_#{attr}_value"
|
||||||
expect(chef_run).to render_file(file.name).with_content(/^rabbit_#{attr}=rabbit_#{attr}_value$/)
|
expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', /^rabbit_#{attr}=rabbit_#{attr}_value$/)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'does not have a rabbit_hosts attribute' do
|
it 'does not have a rabbit_hosts attribute' do
|
||||||
expect(chef_run).not_to render_file(file.name).with_content(/^rabbit_hosts=/)
|
expect(chef_run).not_to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', /^rabbit_hosts=/)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
%w(use_ssl userid).each do |attr|
|
%w(use_ssl userid).each do |attr|
|
||||||
it "has rabbit_#{attr}" do
|
it "has rabbit_#{attr}" do
|
||||||
node.set['openstack']['mq']['block-storage']['rabbit'][attr] = "rabbit_#{attr}_value"
|
node.set['openstack']['mq']['block-storage']['rabbit'][attr] = "rabbit_#{attr}_value"
|
||||||
expect(chef_run).to render_file(file.name).with_content(/^rabbit_#{attr}=rabbit_#{attr}_value$/)
|
expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', /^rabbit_#{attr}=rabbit_#{attr}_value$/)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'has rabbit_password' do
|
it 'has rabbit_password' do
|
||||||
expect(chef_run).to render_file(file.name).with_content(/^rabbit_password=#{test_pass}$/)
|
expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', /^rabbit_password=#{test_pass}$/)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'has rabbit_virtual_host' do
|
it 'has rabbit_virtual_host' do
|
||||||
node.set['openstack']['mq']['block-storage']['rabbit']['vhost'] = 'vhost_value'
|
node.set['openstack']['mq']['block-storage']['rabbit']['vhost'] = 'vhost_value'
|
||||||
expect(chef_run).to render_file(file.name).with_content(/^rabbit_virtual_host=vhost_value$/)
|
expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', /^rabbit_virtual_host=vhost_value$/)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'does not have kombu ssl version set' do
|
it 'does not have kombu ssl version set' do
|
||||||
expect(chef_run).not_to render_config_file(file.name).with_section_content('DEFAULT', /^kombu_ssl_version=TLSv1.2$/)
|
expect(chef_run).not_to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', /^kombu_ssl_version=TLSv1.2$/)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'sets kombu ssl version' do
|
it 'sets kombu ssl version' do
|
||||||
node.set['openstack']['mq']['block-storage']['rabbit']['use_ssl'] = true
|
node.set['openstack']['mq']['block-storage']['rabbit']['use_ssl'] = true
|
||||||
node.set['openstack']['mq']['block-storage']['rabbit']['kombu_ssl_version'] = 'TLSv1.2'
|
node.set['openstack']['mq']['block-storage']['rabbit']['kombu_ssl_version'] = 'TLSv1.2'
|
||||||
|
|
||||||
expect(chef_run).to render_config_file(file.name).with_section_content('DEFAULT', /^kombu_ssl_version=TLSv1.2$/)
|
expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', /^kombu_ssl_version=TLSv1.2$/)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -379,31 +399,39 @@ describe 'openstack-block-storage::cinder-common' do
|
|||||||
node.set['openstack']['mq']['block-storage']['service_type'] = 'qpid'
|
node.set['openstack']['mq']['block-storage']['service_type'] = 'qpid'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'has default RPC/AMQP options set' do
|
||||||
|
[/^rpc_conn_pool_size=30$/,
|
||||||
|
/^amqp_durable_queues=false$/,
|
||||||
|
/^amqp_auto_delete=false$/].each do |line|
|
||||||
|
expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_qpid', line)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
%w(port username sasl_mechanisms reconnect reconnect_timeout reconnect_limit
|
%w(port username sasl_mechanisms reconnect reconnect_timeout reconnect_limit
|
||||||
reconnect_interval_min reconnect_interval_max reconnect_interval heartbeat protocol
|
reconnect_interval_min reconnect_interval_max reconnect_interval heartbeat protocol
|
||||||
tcp_nodelay).each do |attr|
|
tcp_nodelay).each do |attr|
|
||||||
it "has qpid_#{attr} attribute" do
|
it "has qpid_#{attr} attribute" do
|
||||||
node.set['openstack']['mq']['block-storage']['qpid'][attr] = "qpid_#{attr}_value"
|
node.set['openstack']['mq']['block-storage']['qpid'][attr] = "qpid_#{attr}_value"
|
||||||
expect(chef_run).to render_file(file.name).with_content(/^qpid_#{attr}=qpid_#{attr}_value$/)
|
expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_qpid', /^qpid_#{attr}=qpid_#{attr}_value$/)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'has qpid_hostname' do
|
it 'has qpid_hostname' do
|
||||||
node.set['openstack']['mq']['block-storage']['qpid']['host'] = 'qpid_host_value'
|
node.set['openstack']['mq']['block-storage']['qpid']['host'] = 'qpid_host_value'
|
||||||
expect(chef_run).to render_file(file.name).with_content(/^qpid_hostname=qpid_host_value$/)
|
expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_qpid', /^qpid_hostname=qpid_host_value$/)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'has qpid_password' do
|
it 'has qpid_password' do
|
||||||
expect(chef_run).to render_file(file.name).with_content(/^qpid_password=#{test_pass}$/)
|
expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_qpid', /^qpid_password=#{test_pass}$/)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'has default qpid topology version' do
|
it 'has default qpid topology version' do
|
||||||
expect(chef_run).to render_file(file.name).with_content(/^qpid_topology_version=1$/)
|
expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_qpid', /^qpid_topology_version=1$/)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'has qpid notification_topics' do
|
it 'has qpid notification_topics' do
|
||||||
node.set['openstack']['mq']['block-storage']['qpid']['notification_topic'] = 'qpid_notification_topic_value'
|
node.set['openstack']['mq']['block-storage']['qpid']['notification_topic'] = 'qpid_notification_topic_value'
|
||||||
expect(chef_run).to render_file(file.name).with_content(/^notification_topics=qpid_notification_topic_value$/)
|
expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_qpid', /^notification_topics=qpid_notification_topic_value$/)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -10,8 +10,6 @@ debug=<%= node["openstack"]["block-storage"]["debug"] %>
|
|||||||
verbose=<%= node["openstack"]["block-storage"]["verbose"] %>
|
verbose=<%= node["openstack"]["block-storage"]["verbose"] %>
|
||||||
#### (BoolOpt) Print more verbose output
|
#### (BoolOpt) Print more verbose output
|
||||||
|
|
||||||
# lock_path
|
|
||||||
lock_path=<%= node["openstack"]["block-storage"]["lock_path"] %>
|
|
||||||
notification_driver=<%= node["openstack"]["block-storage"]["notification_driver"] %>
|
notification_driver=<%= node["openstack"]["block-storage"]["notification_driver"] %>
|
||||||
|
|
||||||
# log_config=<None>
|
# log_config=<None>
|
||||||
@ -51,18 +49,15 @@ log_file = /var/log/cinder/cinder.log
|
|||||||
#### (StrOpt) Virtualization api connection type : libvirt, xenapi, or
|
#### (StrOpt) Virtualization api connection type : libvirt, xenapi, or
|
||||||
#### fake
|
#### fake
|
||||||
|
|
||||||
sql_connection=<%= @sql_connection %>
|
|
||||||
# sql_connection=sqlite:///$state_path/$sqlite_db
|
|
||||||
#### (StrOpt) The SQLAlchemy connection string used to connect to the
|
|
||||||
#### database
|
|
||||||
|
|
||||||
# sql_connection_debug=0
|
|
||||||
#### (IntOpt) Verbosity of SQL debugging information. 0=None,
|
|
||||||
#### 100=Everything
|
|
||||||
|
|
||||||
# api_paste_config=api-paste.ini
|
# api_paste_config=api-paste.ini
|
||||||
#### (StrOpt) File name for the paste.deploy config for cinder-api
|
#### (StrOpt) File name for the paste.deploy config for cinder-api
|
||||||
|
|
||||||
|
# DEPRECATED: Deploy v1 of the Cinder API. (boolean value)
|
||||||
|
enable_v1_api=false
|
||||||
|
|
||||||
|
# Deploy v2 of the Cinder API. (boolean value)
|
||||||
|
enable_v2_api=true
|
||||||
|
|
||||||
# pybasedir=/usr/lib/python/site-packages
|
# pybasedir=/usr/lib/python/site-packages
|
||||||
#### (StrOpt) Directory where the cinder python module is installed
|
#### (StrOpt) Directory where the cinder python module is installed
|
||||||
|
|
||||||
@ -276,9 +271,6 @@ osapi_volume_workers=<%= node["openstack"]["block-storage"]["osapi_volume_worker
|
|||||||
|
|
||||||
######## defined in cinder.db.api ########
|
######## defined in cinder.db.api ########
|
||||||
|
|
||||||
db_backend=sqlalchemy
|
|
||||||
#### (StrOpt) The backend to use for db
|
|
||||||
|
|
||||||
# enable_new_services=true
|
# enable_new_services=true
|
||||||
#### (BoolOpt) Services to be added to the available pool on create
|
#### (BoolOpt) Services to be added to the available pool on create
|
||||||
|
|
||||||
@ -355,15 +347,9 @@ control_exchange=<%=node['openstack']['block-storage']['control_exchange']%>
|
|||||||
#### (StrOpt) AMQP exchange to connect to if using RabbitMQ or Qpid
|
#### (StrOpt) AMQP exchange to connect to if using RabbitMQ or Qpid
|
||||||
|
|
||||||
rpc_thread_pool_size=<%= node["openstack"]["block-storage"]["rpc_thread_pool_size"] %>
|
rpc_thread_pool_size=<%= node["openstack"]["block-storage"]["rpc_thread_pool_size"] %>
|
||||||
|
|
||||||
#### (IntOpt) Size of RPC thread pool
|
#### (IntOpt) Size of RPC thread pool
|
||||||
|
|
||||||
rpc_conn_pool_size=<%= node["openstack"]["block-storage"]["rpc_conn_pool_size"] %>
|
|
||||||
|
|
||||||
#### (IntOpt) Size of RPC connection pool
|
|
||||||
|
|
||||||
rpc_response_timeout=<%= node["openstack"]["block-storage"]["rpc_response_timeout"] %>
|
rpc_response_timeout=<%= node["openstack"]["block-storage"]["rpc_response_timeout"] %>
|
||||||
|
|
||||||
#### (IntOpt) Seconds to wait for a response from call or multicall
|
#### (IntOpt) Seconds to wait for a response from call or multicall
|
||||||
|
|
||||||
# rpc_cast_timeout=30
|
# rpc_cast_timeout=30
|
||||||
@ -374,131 +360,6 @@ rpc_response_timeout=<%= node["openstack"]["block-storage"]["rpc_response_timeou
|
|||||||
#### (ListOpt) Modules of exceptions that are permitted to be recreatedupon
|
#### (ListOpt) Modules of exceptions that are permitted to be recreatedupon
|
||||||
#### receiving exception data from an rpc call.
|
#### receiving exception data from an rpc call.
|
||||||
|
|
||||||
# from oslo/messaging/_drivers/amqp.py
|
|
||||||
amqp_durable_queues=<%= node['openstack']['mq']['block-storage']['durable_queues'] %>
|
|
||||||
amqp_auto_delete=<%= node['openstack']['mq']['block-storage']['auto_delete'] %>
|
|
||||||
|
|
||||||
<% if @mq_service_type == "rabbitmq" %>
|
|
||||||
|
|
||||||
# fake_rabbit=false
|
|
||||||
#### (BoolOpt) If passed, use a fake RabbitMQ provider
|
|
||||||
|
|
||||||
######## defined in cinder.openstack.common.rpc.impl_kombu ########
|
|
||||||
|
|
||||||
<% if node["openstack"]["mq"]["block-storage"]["rabbit"]["use_ssl"] && node["openstack"]["mq"]["block-storage"]["rabbit"]["kombu_ssl_version"] %>
|
|
||||||
kombu_ssl_version=<%= node["openstack"]["mq"]["block-storage"]["rabbit"]["kombu_ssl_version"] %>
|
|
||||||
#### (StrOpt) SSL version to use (valid only if SSL enabled)
|
|
||||||
<% end -%>
|
|
||||||
|
|
||||||
# kombu_ssl_keyfile=
|
|
||||||
#### (StrOpt) SSL key file (valid only if SSL enabled)
|
|
||||||
|
|
||||||
# kombu_ssl_certfile=
|
|
||||||
#### (StrOpt) SSL cert file (valid only if SSL enabled)
|
|
||||||
|
|
||||||
# kombu_ssl_ca_certs=
|
|
||||||
#### (StrOpt) SSL certification authority file (valid only if SSL enabled)
|
|
||||||
|
|
||||||
<% if node["openstack"]["mq"]["block-storage"]["rabbit"]["ha"] -%>
|
|
||||||
rabbit_hosts=<%= @rabbit_hosts %>
|
|
||||||
#### (ListOpt) RabbitMQ HA cluster host:port pairs
|
|
||||||
|
|
||||||
# rabbit_durable_queues=false
|
|
||||||
#### (BoolOpt) use durable queues in RabbitMQ
|
|
||||||
|
|
||||||
rabbit_ha_queues=True
|
|
||||||
#### (BoolOpt) use H/A queues in RabbitMQ (x-ha-policy: all).You need to
|
|
||||||
#### wipe RabbitMQ database when changing this option.
|
|
||||||
<% else -%>
|
|
||||||
rabbit_host=<%= node["openstack"]["mq"]["block-storage"]["rabbit"]["host"] %>
|
|
||||||
#### (StrOpt) The RabbitMQ broker address where a single node is used
|
|
||||||
|
|
||||||
rabbit_port=<%= node["openstack"]["mq"]["block-storage"]["rabbit"]["port"] %>
|
|
||||||
#### (IntOpt) The RabbitMQ broker port where a single node is used
|
|
||||||
<% end -%>
|
|
||||||
|
|
||||||
rabbit_use_ssl=<%= node["openstack"]["mq"]["block-storage"]["rabbit"]["use_ssl"] %>
|
|
||||||
#### (BoolOpt) connect over SSL for RabbitMQ
|
|
||||||
|
|
||||||
rabbit_userid=<%= node["openstack"]["mq"]["block-storage"]["rabbit"]["userid"] %>
|
|
||||||
#### (StrOpt) the RabbitMQ userid
|
|
||||||
|
|
||||||
rabbit_password=<%= @mq_password %>
|
|
||||||
#### (StrOpt) the RabbitMQ password
|
|
||||||
|
|
||||||
rabbit_virtual_host=<%= node["openstack"]["mq"]["block-storage"]["rabbit"]["vhost"] %>
|
|
||||||
#### (StrOpt) the RabbitMQ virtual host
|
|
||||||
|
|
||||||
notification_topics=<%= node["openstack"]["mq"]["block-storage"]["rabbit"]["notification_topic"] %>
|
|
||||||
#### (ListOpt) AMQP topic used for openstack notifications
|
|
||||||
|
|
||||||
# rabbit_retry_interval=1
|
|
||||||
#### (IntOpt) how frequently to retry connecting with RabbitMQ
|
|
||||||
|
|
||||||
# rabbit_retry_backoff=2
|
|
||||||
#### (IntOpt) how long to backoff for between retries when connecting to
|
|
||||||
#### RabbitMQ
|
|
||||||
|
|
||||||
# rabbit_max_retries=0
|
|
||||||
#### (IntOpt) maximum retries with trying to connect to RabbitMQ (the
|
|
||||||
#### default of 0 implies an infinite retry count)
|
|
||||||
|
|
||||||
<% end %>
|
|
||||||
|
|
||||||
|
|
||||||
<% if @mq_service_type == "qpid" %>
|
|
||||||
|
|
||||||
##### QPID #####
|
|
||||||
######## defined in cinder.openstack.common.rpc.impl_qpid ########
|
|
||||||
qpid_hostname=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["host"] %>
|
|
||||||
#### (StrOpt) Qpid broker hostname
|
|
||||||
|
|
||||||
qpid_port=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["port"] %>
|
|
||||||
#### (StrOpt) Qpid broker port
|
|
||||||
|
|
||||||
qpid_username=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["username"] %>
|
|
||||||
#### (StrOpt) Username for qpid connection
|
|
||||||
|
|
||||||
qpid_password=<%= @mq_password %>
|
|
||||||
#### (StrOpt) Password for qpid connection
|
|
||||||
|
|
||||||
qpid_sasl_mechanisms=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["sasl_mechanisms"] %>
|
|
||||||
#### (StrOpt) Space separated list of SASL mechanisms to use for auth
|
|
||||||
|
|
||||||
qpid_reconnect=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["reconnect"] %>
|
|
||||||
#### (BoolOpt) Automatically reconnect
|
|
||||||
|
|
||||||
qpid_reconnect_timeout=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["reconnect_timeout"] %>
|
|
||||||
#### (IntOpt) Reconnection timeout in seconds
|
|
||||||
|
|
||||||
qpid_reconnect_limit=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["reconnect_limit"] %>
|
|
||||||
#### (IntOpt) Max reconnections before giving up
|
|
||||||
|
|
||||||
qpid_reconnect_interval_min=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["reconnect_interval_min"] %>
|
|
||||||
#### (IntOpt) Minimum seconds between reconnection attempts
|
|
||||||
|
|
||||||
qpid_reconnect_interval_max=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["reconnect_interval_max"] %>
|
|
||||||
#### (IntOpt) Maximum seconds between reconnection attempts
|
|
||||||
|
|
||||||
qpid_reconnect_interval=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["reconnect_interval"] %>
|
|
||||||
#### (IntOpt) Equivalent to setting max and min to the same value
|
|
||||||
|
|
||||||
qpid_heartbeat=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["heartbeat"] %>
|
|
||||||
#### (IntOpt) Seconds between connection keepalive heartbeats
|
|
||||||
|
|
||||||
qpid_protocol=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["protocol"] %>
|
|
||||||
#### (StrOpt) Transport to use, either 'tcp' or 'ssl'
|
|
||||||
|
|
||||||
qpid_tcp_nodelay=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["tcp_nodelay"] %>
|
|
||||||
#### (BoolOpt) Disable Nagle algorithm
|
|
||||||
|
|
||||||
qpid_topology_version=<%= node['openstack']['mq']['block-storage']['qpid']['topology_version'] %>
|
|
||||||
#### (IntOpt) See oslo/messaging/_drivers/impl_qpid.py for details
|
|
||||||
|
|
||||||
notification_topics=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["notification_topic"] %>
|
|
||||||
#### (ListOpt) AMQP topic used for openstack notifications
|
|
||||||
<% end %>
|
|
||||||
|
|
||||||
|
|
||||||
######## defined in cinder.openstack.common.rpc.impl_zmq ########
|
######## defined in cinder.openstack.common.rpc.impl_zmq ########
|
||||||
|
|
||||||
@ -1074,6 +935,25 @@ enabled_backends = <%= @multi_backend_sections.keys.join(',') %>
|
|||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
|
[database]
|
||||||
|
|
||||||
|
#
|
||||||
|
# Options defined in oslo.db
|
||||||
|
#
|
||||||
|
|
||||||
|
backend=sqlalchemy
|
||||||
|
#### (StrOpt) The backend to use for db
|
||||||
|
|
||||||
|
connection=<%= @sql_connection %>
|
||||||
|
# sql_connection=sqlite:///$state_path/$sqlite_db
|
||||||
|
#### (StrOpt) The SQLAlchemy connection string used to connect to the
|
||||||
|
#### database
|
||||||
|
|
||||||
|
# sql_connection_debug=0
|
||||||
|
#### (IntOpt) Verbosity of SQL debugging information. 0=None,
|
||||||
|
#### 100=Everything
|
||||||
|
|
||||||
|
|
||||||
[keystone_authtoken]
|
[keystone_authtoken]
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -1227,3 +1107,156 @@ memcache_secret_key = <%= node['openstack']['block-storage']['api']['auth']['mem
|
|||||||
# (list value)
|
# (list value)
|
||||||
#hash_algorithms=md5
|
#hash_algorithms=md5
|
||||||
hash_algorithms = <%= node['openstack']['block-storage']['api']['auth']['hash_algorithms'] %>
|
hash_algorithms = <%= node['openstack']['block-storage']['api']['auth']['hash_algorithms'] %>
|
||||||
|
|
||||||
|
|
||||||
|
[oslo_concurrency]
|
||||||
|
|
||||||
|
# lock_path
|
||||||
|
lock_path=<%= node["openstack"]["block-storage"]["lock_path"] %>
|
||||||
|
|
||||||
|
|
||||||
|
<% if @mq_service_type == "qpid" %>
|
||||||
|
[oslo_messaging_qpid]
|
||||||
|
|
||||||
|
#
|
||||||
|
# From oslo.messaging
|
||||||
|
#
|
||||||
|
|
||||||
|
# from oslo/messaging/_drivers/amqp.py
|
||||||
|
amqp_durable_queues=<%= node['openstack']['mq']['block-storage']['durable_queues'] %>
|
||||||
|
amqp_auto_delete=<%= node['openstack']['mq']['block-storage']['auto_delete'] %>
|
||||||
|
|
||||||
|
rpc_conn_pool_size=<%= node["openstack"]["block-storage"]["rpc_conn_pool_size"] %>
|
||||||
|
|
||||||
|
#### (IntOpt) Size of RPC connection pool
|
||||||
|
|
||||||
|
##### QPID #####
|
||||||
|
######## defined in cinder.openstack.common.rpc.impl_qpid ########
|
||||||
|
qpid_hostname=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["host"] %>
|
||||||
|
#### (StrOpt) Qpid broker hostname
|
||||||
|
|
||||||
|
qpid_port=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["port"] %>
|
||||||
|
#### (StrOpt) Qpid broker port
|
||||||
|
|
||||||
|
qpid_username=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["username"] %>
|
||||||
|
#### (StrOpt) Username for qpid connection
|
||||||
|
|
||||||
|
qpid_password=<%= @mq_password %>
|
||||||
|
#### (StrOpt) Password for qpid connection
|
||||||
|
|
||||||
|
qpid_sasl_mechanisms=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["sasl_mechanisms"] %>
|
||||||
|
#### (StrOpt) Space separated list of SASL mechanisms to use for auth
|
||||||
|
|
||||||
|
qpid_reconnect=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["reconnect"] %>
|
||||||
|
#### (BoolOpt) Automatically reconnect
|
||||||
|
|
||||||
|
qpid_reconnect_timeout=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["reconnect_timeout"] %>
|
||||||
|
#### (IntOpt) Reconnection timeout in seconds
|
||||||
|
|
||||||
|
qpid_reconnect_limit=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["reconnect_limit"] %>
|
||||||
|
#### (IntOpt) Max reconnections before giving up
|
||||||
|
|
||||||
|
qpid_reconnect_interval_min=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["reconnect_interval_min"] %>
|
||||||
|
#### (IntOpt) Minimum seconds between reconnection attempts
|
||||||
|
|
||||||
|
qpid_reconnect_interval_max=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["reconnect_interval_max"] %>
|
||||||
|
#### (IntOpt) Maximum seconds between reconnection attempts
|
||||||
|
|
||||||
|
qpid_reconnect_interval=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["reconnect_interval"] %>
|
||||||
|
#### (IntOpt) Equivalent to setting max and min to the same value
|
||||||
|
|
||||||
|
qpid_heartbeat=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["heartbeat"] %>
|
||||||
|
#### (IntOpt) Seconds between connection keepalive heartbeats
|
||||||
|
|
||||||
|
qpid_protocol=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["protocol"] %>
|
||||||
|
#### (StrOpt) Transport to use, either 'tcp' or 'ssl'
|
||||||
|
|
||||||
|
qpid_tcp_nodelay=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["tcp_nodelay"] %>
|
||||||
|
#### (BoolOpt) Disable Nagle algorithm
|
||||||
|
|
||||||
|
qpid_topology_version=<%= node['openstack']['mq']['block-storage']['qpid']['topology_version'] %>
|
||||||
|
#### (IntOpt) See oslo/messaging/_drivers/impl_qpid.py for details
|
||||||
|
|
||||||
|
notification_topics=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["notification_topic"] %>
|
||||||
|
#### (ListOpt) AMQP topic used for openstack notifications
|
||||||
|
<% end %>
|
||||||
|
|
||||||
|
<% if @mq_service_type == "rabbitmq" %>
|
||||||
|
[oslo_messaging_rabbit]
|
||||||
|
|
||||||
|
#
|
||||||
|
# From oslo.messaging
|
||||||
|
#
|
||||||
|
|
||||||
|
# from oslo/messaging/_drivers/amqp.py
|
||||||
|
amqp_durable_queues=<%= node['openstack']['mq']['block-storage']['durable_queues'] %>
|
||||||
|
amqp_auto_delete=<%= node['openstack']['mq']['block-storage']['auto_delete'] %>
|
||||||
|
|
||||||
|
rpc_conn_pool_size=<%= node["openstack"]["block-storage"]["rpc_conn_pool_size"] %>
|
||||||
|
|
||||||
|
#### (IntOpt) Size of RPC connection pool
|
||||||
|
|
||||||
|
# fake_rabbit=false
|
||||||
|
#### (BoolOpt) If passed, use a fake RabbitMQ provider
|
||||||
|
|
||||||
|
######## defined in cinder.openstack.common.rpc.impl_kombu ########
|
||||||
|
|
||||||
|
<% if node["openstack"]["mq"]["block-storage"]["rabbit"]["use_ssl"] && node["openstack"]["mq"]["block-storage"]["rabbit"]["kombu_ssl_version"] %>
|
||||||
|
kombu_ssl_version=<%= node["openstack"]["mq"]["block-storage"]["rabbit"]["kombu_ssl_version"] %>
|
||||||
|
#### (StrOpt) SSL version to use (valid only if SSL enabled)
|
||||||
|
<% end -%>
|
||||||
|
|
||||||
|
# kombu_ssl_keyfile=
|
||||||
|
#### (StrOpt) SSL key file (valid only if SSL enabled)
|
||||||
|
|
||||||
|
# kombu_ssl_certfile=
|
||||||
|
#### (StrOpt) SSL cert file (valid only if SSL enabled)
|
||||||
|
|
||||||
|
# kombu_ssl_ca_certs=
|
||||||
|
#### (StrOpt) SSL certification authority file (valid only if SSL enabled)
|
||||||
|
|
||||||
|
<% if node["openstack"]["mq"]["block-storage"]["rabbit"]["ha"] -%>
|
||||||
|
rabbit_hosts=<%= @rabbit_hosts %>
|
||||||
|
#### (ListOpt) RabbitMQ HA cluster host:port pairs
|
||||||
|
|
||||||
|
# rabbit_durable_queues=false
|
||||||
|
#### (BoolOpt) use durable queues in RabbitMQ
|
||||||
|
|
||||||
|
rabbit_ha_queues=True
|
||||||
|
#### (BoolOpt) use H/A queues in RabbitMQ (x-ha-policy: all).You need to
|
||||||
|
#### wipe RabbitMQ database when changing this option.
|
||||||
|
<% else -%>
|
||||||
|
rabbit_host=<%= node["openstack"]["mq"]["block-storage"]["rabbit"]["host"] %>
|
||||||
|
#### (StrOpt) The RabbitMQ broker address where a single node is used
|
||||||
|
|
||||||
|
rabbit_port=<%= node["openstack"]["mq"]["block-storage"]["rabbit"]["port"] %>
|
||||||
|
#### (IntOpt) The RabbitMQ broker port where a single node is used
|
||||||
|
<% end -%>
|
||||||
|
|
||||||
|
rabbit_use_ssl=<%= node["openstack"]["mq"]["block-storage"]["rabbit"]["use_ssl"] %>
|
||||||
|
#### (BoolOpt) connect over SSL for RabbitMQ
|
||||||
|
|
||||||
|
rabbit_userid=<%= node["openstack"]["mq"]["block-storage"]["rabbit"]["userid"] %>
|
||||||
|
#### (StrOpt) the RabbitMQ userid
|
||||||
|
|
||||||
|
rabbit_password=<%= @mq_password %>
|
||||||
|
#### (StrOpt) the RabbitMQ password
|
||||||
|
|
||||||
|
rabbit_virtual_host=<%= node["openstack"]["mq"]["block-storage"]["rabbit"]["vhost"] %>
|
||||||
|
#### (StrOpt) the RabbitMQ virtual host
|
||||||
|
|
||||||
|
notification_topics=<%= node["openstack"]["mq"]["block-storage"]["rabbit"]["notification_topic"] %>
|
||||||
|
#### (ListOpt) AMQP topic used for openstack notifications
|
||||||
|
|
||||||
|
# rabbit_retry_interval=1
|
||||||
|
#### (IntOpt) how frequently to retry connecting with RabbitMQ
|
||||||
|
|
||||||
|
# rabbit_retry_backoff=2
|
||||||
|
#### (IntOpt) how long to backoff for between retries when connecting to
|
||||||
|
#### RabbitMQ
|
||||||
|
|
||||||
|
# rabbit_max_retries=0
|
||||||
|
#### (IntOpt) maximum retries with trying to connect to RabbitMQ (the
|
||||||
|
#### default of 0 implies an infinite retry count)
|
||||||
|
|
||||||
|
<% end %>
|
||||||
|
Loading…
Reference in New Issue
Block a user