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: Ibdd35e55ab79bc684782182d3e4341e672f04401
This commit is contained in:
parent
f12809d382
commit
2a1a38b542
|
@ -78,8 +78,8 @@ TODO
|
|||
|
||||
Neutron Nova interactions
|
||||
-------------------------
|
||||
* `openstack["network"]["nova"]["nova_ca_certificates_file"]` - CA file for novaclient to verify server certificates
|
||||
* `openstack["network"]["nova"]["nova_api_insecure"]` - Boolean to control ignoring SSL errors on the nova url
|
||||
* `openstack["network"]["nova"]["cafile"]` - CA file for novaclient to verify server certificates
|
||||
* `openstack["network"]["nova"]["insecure"]` - Boolean to control ignoring SSL errors on the nova url
|
||||
|
||||
MQ attributes
|
||||
-------------
|
||||
|
|
|
@ -222,11 +222,14 @@ default['openstack']['network']['rpc_conn_pool_size'] = 30
|
|||
default['openstack']['network']['rpc_response_timeout'] = 60
|
||||
|
||||
# ======== Neutron Nova interactions ==========
|
||||
# Name of the plugin to load
|
||||
default['openstack']['network']['nova']['auth_plugin'] = 'password'
|
||||
|
||||
# CA file for novaclient to verify server certificates
|
||||
default['openstack']['network']['nova']['nova_ca_certificates_file'] = nil
|
||||
default['openstack']['network']['nova']['cafile'] = nil
|
||||
|
||||
# Boolean to control ignoring SSL errors on the nova url
|
||||
default['openstack']['network']['nova']['nova_api_insecure'] = false
|
||||
default['openstack']['network']['nova']['insecure'] = false
|
||||
|
||||
# Send notification to nova when port status is active.
|
||||
default['openstack']['network']['nova']['notify_nova_on_port_status_changes'] = 'True'
|
||||
|
|
|
@ -442,7 +442,7 @@ describe 'openstack-network' do
|
|||
let(:file_name) { file.name }
|
||||
end
|
||||
|
||||
%w(debug verbose state_path lock_path log_dir auth_strategy
|
||||
%w(debug verbose state_path log_dir auth_strategy
|
||||
dhcp_lease_duration rpc_thread_pool_size rpc_conn_pool_size
|
||||
rpc_response_timeout control_exchange allow_overlapping_ips
|
||||
notification_driver api_workers rpc_workers).each do |attr|
|
||||
|
@ -452,6 +452,11 @@ describe 'openstack-network' do
|
|||
end
|
||||
end
|
||||
|
||||
it 'sets the lock_path attribute' do
|
||||
node.set['openstack']['network']['lock_path'] = 'lock_path_value'
|
||||
expect(chef_run).to render_config_file(file.name).with_section_content('oslo_concurrency', /^lock_path = lock_path_value$/)
|
||||
end
|
||||
|
||||
it 'sets the log_config attribute if using syslog' do
|
||||
node.set['openstack']['network']['syslog']['use'] = true
|
||||
expect(chef_run).to render_file(file.name).with_content(%r(^log_config = /etc/openstack/logging.conf$))
|
||||
|
@ -501,13 +506,6 @@ describe 'openstack-network' do
|
|||
expect(chef_run).not_to render_file(file.name).with_content(/^service_plugins = $/)
|
||||
end
|
||||
|
||||
%w(durable_queues auto_delete).each do |attr|
|
||||
it "sets the ampq queue #{attr} attribute" do
|
||||
node.set['openstack']['mq']['network'][attr] = "#{attr}_value"
|
||||
expect(chef_run).to render_file(file.name).with_content(/^amqp_#{attr}=#{attr}_value$/)
|
||||
end
|
||||
end
|
||||
|
||||
context 'rabbitmq service' do
|
||||
let(:userid) { 'rabbit_userid_value' }
|
||||
let(:password) { 'rabbit_password' }
|
||||
|
@ -519,25 +517,32 @@ describe 'openstack-network' do
|
|||
.and_return(password)
|
||||
end
|
||||
|
||||
%w(durable_queues auto_delete).each do |attr|
|
||||
it "sets the ampq queue #{attr} attribute" do
|
||||
node.set['openstack']['mq']['network'][attr] = "#{attr}_value"
|
||||
expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', /^amqp_#{attr}=#{attr}_value$/)
|
||||
end
|
||||
end
|
||||
|
||||
it 'sets the rabbit_userid attribute' do
|
||||
expect(chef_run).to render_file(file.name).with_content(/^rabbit_userid=#{userid}$/)
|
||||
expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', /^rabbit_userid=#{userid}$/)
|
||||
end
|
||||
|
||||
it 'sets the rabbit_password attribute' do
|
||||
expect(chef_run).to render_file(file.name).with_content(/^rabbit_password=#{password}$/)
|
||||
expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', /^rabbit_password=#{password}$/)
|
||||
end
|
||||
|
||||
it 'sets the rabbit_virtual_host attribute' do
|
||||
node.set['openstack']['mq']['network']['rabbit']['vhost'] = 'rabbit_virtual_host_value'
|
||||
expect(chef_run).to render_file(file.name).with_content(/^rabbit_virtual_host=rabbit_virtual_host_value$/)
|
||||
expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', /^rabbit_virtual_host=rabbit_virtual_host_value$/)
|
||||
end
|
||||
|
||||
it 'sets the rabbit_retry_interval' do
|
||||
expect(chef_run).to render_file(file.name).with_content(/^rabbit_retry_interval=1$/)
|
||||
expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', /^rabbit_retry_interval=1$/)
|
||||
end
|
||||
|
||||
it 'sets the rabbit_max_retries' do
|
||||
expect(chef_run).to render_file(file.name).with_content(/^rabbit_max_retries=0$/)
|
||||
expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', /^rabbit_max_retries=0$/)
|
||||
end
|
||||
|
||||
context 'rabbit ha enabled' do
|
||||
|
@ -548,15 +553,15 @@ describe 'openstack-network' do
|
|||
it 'sets the rabbit_hosts attribute' do
|
||||
allow_any_instance_of(Chef::Recipe).to receive(:rabbit_servers)
|
||||
.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
|
||||
|
||||
it 'sets the rabbit_ha_queues attribute' do
|
||||
expect(chef_run).to render_file(file.name).with_content(/^rabbit_ha_queues=True$/)
|
||||
expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', /^rabbit_ha_queues=True$/)
|
||||
end
|
||||
|
||||
it 'sets the rabbit_use_ssl attribute' do
|
||||
expect(chef_run).to render_file(file.name).with_content(/^rabbit_use_ssl=false$/)
|
||||
expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', /^rabbit_use_ssl=false$/)
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -568,20 +573,20 @@ describe 'openstack-network' do
|
|||
%w(host port use_ssl).each do |attr|
|
||||
it "sets the non-ha rabbit_#{attr} attribute" do
|
||||
node.set['openstack']['mq']['network']['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
|
||||
|
||||
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
|
||||
|
||||
it 'sets kombu ssl version' do
|
||||
node.set['openstack']['mq']['network']['rabbit']['use_ssl'] = true
|
||||
node.set['openstack']['mq']['network']['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
|
||||
|
||||
|
@ -593,23 +598,30 @@ describe 'openstack-network' do
|
|||
.and_return('qpid_password_value')
|
||||
end
|
||||
|
||||
%w(durable_queues auto_delete).each do |attr|
|
||||
it "sets the ampq queue #{attr} attribute" do
|
||||
node.set['openstack']['mq']['network'][attr] = "#{attr}_value"
|
||||
expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_qpid', /^amqp_#{attr}=#{attr}_value$/)
|
||||
end
|
||||
end
|
||||
|
||||
%w(port username sasl_mechanisms reconnect reconnect_timeout reconnect_limit
|
||||
reconnect_interval_min reconnect_interval_max reconnect_interval heartbeat
|
||||
protocol tcp_nodelay topology_version).each do |attr|
|
||||
it "sets the common qpid #{attr} attribute" do
|
||||
node.set['openstack']['mq']['network']['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
|
||||
|
||||
it 'sets the qpid_hostname attribute' do
|
||||
node.set['openstack']['mq']['network']['qpid']['host'] = 'qpid_hostname_value'
|
||||
expect(chef_run).to render_file(file.name).with_content(/^qpid_hostname=qpid_hostname_value$/)
|
||||
expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_qpid', /^qpid_hostname=qpid_hostname_value$/)
|
||||
end
|
||||
|
||||
it 'sets the qpid_password attribute' do
|
||||
node.set['openstack']['mq']['network']['qpid']['username'] = 'qpid_username_value'
|
||||
expect(chef_run).to render_file(file.name).with_content(/^qpid_password=qpid_password_value$/)
|
||||
expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_qpid', /^qpid_password=qpid_password_value$/)
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -652,46 +664,50 @@ describe 'openstack-network' do
|
|||
end
|
||||
end
|
||||
|
||||
it 'has default nova auth_plugin attribute' do
|
||||
expect(chef_run).to render_config_file(file.name).with_section_content('nova', /^auth_plugin = password/)
|
||||
end
|
||||
|
||||
it 'does not set the sets admin_tenant_id' do
|
||||
expect(chef_run).not_to render_config_file(file.name).with_section_content('DEFAULT', /^nova_admin_tenant_id =/)
|
||||
expect(chef_run).not_to render_config_file(file.name).with_section_content('nova', /^admin_tenant_id =/)
|
||||
end
|
||||
|
||||
%w(region_name admin_username admin_tenant_id admin_tenant_name).each do |attr|
|
||||
it "sets the #{attr} nova attribute" do
|
||||
node.set['openstack']['network']['nova'][attr] = "nova_#{attr}_value"
|
||||
expect(chef_run).to render_config_file(file.name).with_section_content('DEFAULT', /^nova_#{attr} = nova_#{attr}_value$/)
|
||||
expect(chef_run).to render_config_file(file.name).with_section_content('nova', /^#{attr} = nova_#{attr}_value$/)
|
||||
end
|
||||
end
|
||||
|
||||
it 'sets the nova_url attribute with the right version' do
|
||||
it 'sets the nova url attribute with the right version' do
|
||||
node.set['openstack']['network']['nova']['url_version'] = '/nova_version_value'
|
||||
expect(chef_run).to render_file(file.name).with_content(%r(^nova_url = http://127.0.0.1:8774/nova_version_value$))
|
||||
expect(chef_run).to render_config_file(file.name).with_section_content('nova', %r(^url = http://127.0.0.1:8774/nova_version_value$))
|
||||
end
|
||||
|
||||
it 'sets the nova_admin_password attribute' do
|
||||
expect(chef_run).to render_file(file.name).with_content(/^nova_admin_password = nova-pass$/)
|
||||
it 'sets the nova admin_password attribute' do
|
||||
expect(chef_run).to render_config_file(file.name).with_section_content('nova', /^admin_password = nova-pass$/)
|
||||
end
|
||||
|
||||
it 'sets the nova_admin_auth_url attribute' do
|
||||
expect(chef_run).to render_file(file.name).with_content(%r(^nova_admin_auth_url = http://127.0.0.1:35357/v2.0$))
|
||||
it 'sets the nova admin_auth_url attribute' do
|
||||
expect(chef_run).to render_config_file(file.name).with_section_content('nova', %r(^admin_auth_url = http://127.0.0.1:35357/v2.0$))
|
||||
end
|
||||
|
||||
it 'has default nova_api_insecure' do
|
||||
expect(chef_run).to render_file(file.name).with_content(/^nova_api_insecure = false$/)
|
||||
it 'has default nova api insecure' do
|
||||
expect(chef_run).to render_config_file(file.name).with_section_content('nova', /^insecure = false$/)
|
||||
end
|
||||
|
||||
it 'sets nova_api_insecure' do
|
||||
node.set['openstack']['network']['nova']['nova_api_insecure'] = true
|
||||
expect(chef_run).to render_file(file.name).with_content(/^nova_api_insecure = true$/)
|
||||
it 'sets nova api insecure' do
|
||||
node.set['openstack']['network']['nova']['insecure'] = true
|
||||
expect(chef_run).to render_config_file(file.name).with_section_content('nova', /^insecure = true$/)
|
||||
end
|
||||
|
||||
it 'has no nova_ca_certificates_file set by default' do
|
||||
expect(chef_run).not_to render_file(file.name).with_content(/^nova_ca_certificates_file =/)
|
||||
it 'has no nova ca certificates file set by default' do
|
||||
expect(chef_run).not_to render_config_file(file.name).with_section_content('nova', /^cafile =/)
|
||||
end
|
||||
|
||||
it 'sets nova_ca_certificates_file' do
|
||||
node.set['openstack']['network']['nova']['nova_ca_certificates_file'] = 'dir/to/path'
|
||||
expect(chef_run).to render_file(file.name).with_content(%r{^nova_ca_certificates_file = dir/to/path$})
|
||||
node.set['openstack']['network']['nova']['cafile'] = 'dir/to/path'
|
||||
expect(chef_run).to render_config_file(file.name).with_section_content('nova', %r{^cafile = dir/to/path$})
|
||||
end
|
||||
|
||||
it 'sets the misc_neutron values' do
|
||||
|
|
|
@ -20,9 +20,6 @@ debug = <%= node["openstack"]["network"]["debug"] %>
|
|||
# user executing the agent.
|
||||
state_path = <%= node["openstack"]["network"]["state_path"] %>
|
||||
|
||||
# Where to store lock files
|
||||
lock_path = <%= node["openstack"]["network"]["lock_path"] %>
|
||||
|
||||
# log_format = %(asctime)s %(levelname)8s [%(name)s] %(message)s
|
||||
# log_date_format = %Y-%m-%d %H:%M:%S
|
||||
|
||||
|
@ -139,9 +136,6 @@ rpc_response_timeout = <%= node['openstack']['network']['rpc_response_timeout']
|
|||
# allowed_rpc_exception_modules = neutron.openstack.common.exception, nova.exception
|
||||
# AMQP exchange to connect to if using RabbitMQ or QPID
|
||||
control_exchange = <%= node["openstack"]["network"]["control_exchange"] %>
|
||||
# AMQP queue config options
|
||||
amqp_durable_queues=<%= node['openstack']['mq']['network']['durable_queues'] %>
|
||||
amqp_auto_delete=<%= node['openstack']['mq']['network']['auto_delete'] %>
|
||||
|
||||
# Configuration options if sending notifications via kombu rpc (these are
|
||||
# the defaults)
|
||||
|
@ -157,55 +151,6 @@ amqp_auto_delete=<%= node['openstack']['mq']['network']['auto_delete'] %>
|
|||
# allow_overlapping_ips = False
|
||||
allow_overlapping_ips = <%= node["openstack"]["network"]["allow_overlapping_ips"] %>
|
||||
|
||||
<% if @mq_service_type == "rabbitmq" %>
|
||||
<% if node["openstack"]["mq"]["network"]["rabbit"]["use_ssl"] && node["openstack"]["mq"]["network"]["rabbit"]["kombu_ssl_version"] %>
|
||||
kombu_ssl_version=<%= node["openstack"]["mq"]["network"]["rabbit"]["kombu_ssl_version"] %>
|
||||
<% end -%>
|
||||
|
||||
##### RABBITMQ #####
|
||||
rpc_backend=neutron.openstack.common.rpc.impl_kombu
|
||||
rabbit_userid=<%= node["openstack"]["mq"]["network"]["rabbit"]["userid"] %>
|
||||
rabbit_password=<%= @mq_password %>
|
||||
rabbit_virtual_host=<%= node["openstack"]["mq"]["network"]["rabbit"]["vhost"] %>
|
||||
<% if node["openstack"]["mq"]["network"]["rabbit"]["ha"] %>
|
||||
# Use HA queues in RabbitMQ (x-ha-policy: all).You need to
|
||||
# wipe RabbitMQ database when changing this option. (boolean value)
|
||||
rabbit_hosts=<%= @rabbit_hosts %>
|
||||
rabbit_ha_queues=True
|
||||
rabbit_use_ssl=<%= node["openstack"]["mq"]["network"]["rabbit"]["use_ssl"] %>
|
||||
<% else %>
|
||||
rabbit_host=<%= node["openstack"]["mq"]["network"]["rabbit"]["host"] %>
|
||||
rabbit_port=<%= node["openstack"]["mq"]["network"]["rabbit"]["port"] %>
|
||||
rabbit_use_ssl=<%= node["openstack"]["mq"]["network"]["rabbit"]["use_ssl"] %>
|
||||
<% end %>
|
||||
# Maximum retries with trying to connect to RabbitMQ
|
||||
# (the default of 0 implies an infinite retry count)
|
||||
rabbit_max_retries=<%= node["openstack"]["mq"]["network"]["rabbit"]["rabbit_max_retries"] %>
|
||||
# RabbitMQ connection retry interval
|
||||
rabbit_retry_interval=<%= node["openstack"]["mq"]["network"]["rabbit"]["rabbit_retry_interval"] %>
|
||||
<% end %>
|
||||
|
||||
<% if @mq_service_type == "qpid" %>
|
||||
##### QPID #####
|
||||
rpc_backend=neutron.openstack.common.rpc.impl_qpid
|
||||
qpid_hostname=<%= node["openstack"]["mq"]["network"]["qpid"]["host"] %>
|
||||
qpid_port=<%= node["openstack"]["mq"]["network"]["qpid"]["port"] %>
|
||||
qpid_password=<%= @mq_password %>
|
||||
qpid_username=<%= node["openstack"]["mq"]["network"]["qpid"]["username"] %>
|
||||
qpid_sasl_mechanisms=<%= node["openstack"]["mq"]["network"]["qpid"]["sasl_mechanisms"] %>
|
||||
qpid_reconnect=<%= node["openstack"]["mq"]["network"]["qpid"]["reconnect"] %>
|
||||
qpid_reconnect_timeout=<%= node["openstack"]["mq"]["network"]["qpid"]["reconnect_timeout"] %>
|
||||
qpid_reconnect_limit=<%= node["openstack"]["mq"]["network"]["qpid"]["reconnect_limit"] %>
|
||||
qpid_reconnect_interval_min=<%= node["openstack"]["mq"]["network"]["qpid"]["reconnect_interval_min"] %>
|
||||
qpid_reconnect_interval_max=<%= node["openstack"]["mq"]["network"]["qpid"]["reconnect_interval_max"] %>
|
||||
qpid_reconnect_interval=<%= node["openstack"]["mq"]["network"]["qpid"]["reconnect_interval"] %>
|
||||
qpid_heartbeat=<%= node["openstack"]["mq"]["network"]["qpid"]["heartbeat"] %>
|
||||
# qpid protocol. default 'tcp'. set to 'ssl' to enable SSL
|
||||
qpid_protocol=<%= node["openstack"]["mq"]["network"]["qpid"]["protocol"] %>
|
||||
qpid_tcp_nodelay=<%= node["openstack"]["mq"]["network"]["qpid"]["tcp_nodelay"] %>
|
||||
qpid_topology_version=<%= node['openstack']['mq']['network']['qpid']['topology_version'] %>
|
||||
<% end %>
|
||||
|
||||
# ZMQ
|
||||
# rpc_backend=neutron.openstack.common.rpc.impl_zmq
|
||||
# ZeroMQ bind address. Should be a wildcard (*), an ethernet interface, or IP.
|
||||
|
@ -354,41 +299,6 @@ notify_nova_on_port_status_changes = <%= node["openstack"]["network"]["nova"]["n
|
|||
# so nova can update it's cache.
|
||||
notify_nova_on_port_data_changes = <%= node["openstack"]["network"]["nova"]["notify_nova_on_port_data_changes"] %>
|
||||
|
||||
# URL for connection to nova (Only supports one nova region currently).
|
||||
nova_url = <%= @nova_endpoint %>
|
||||
|
||||
# Name of nova region to use. Useful if keystone manages more than one region
|
||||
nova_region_name = <%= node["openstack"]["network"]["nova"]["region_name"] %>
|
||||
|
||||
# Username for connection to nova in admin context
|
||||
nova_admin_username = <%= node["openstack"]["network"]["nova"]["admin_username"] %>
|
||||
|
||||
<% if node['openstack']['network']['nova']['admin_tenant_id'] -%>
|
||||
# The uuid of the admin nova tenant
|
||||
nova_admin_tenant_id = <%= node["openstack"]["network"]["nova"]["admin_tenant_id"] %>
|
||||
<% end -%>
|
||||
|
||||
# The name of the admin nova tenant. If the uuid of the admin nova tenant
|
||||
# is set, this is optional.
|
||||
nova_admin_tenant_name = <%= node["openstack"]["network"]["nova"]["admin_tenant_name"] %>
|
||||
|
||||
# Password for connection to nova in admin context.
|
||||
nova_admin_password = <%= @nova_admin_pass %>
|
||||
|
||||
# Authorization URL for connection to nova in admin context.
|
||||
nova_admin_auth_url = <%= @identity_admin_endpoint.to_s %>
|
||||
|
||||
# CA file for novaclient to verify server certificates
|
||||
<% if node['openstack']['network']['nova']['nova_ca_certificates_file'] -%>
|
||||
nova_ca_certificates_file = <%= node['openstack']['network']['nova']['nova_ca_certificates_file'] %>
|
||||
<% else -%>
|
||||
# nova_ca_certificates_file =
|
||||
<% end -%>
|
||||
|
||||
# Boolean to control ignoring SSL errors on the nova url
|
||||
# nova_api_insecure = False
|
||||
nova_api_insecure = <%= node['openstack']['network']['nova']['nova_api_insecure'] %>
|
||||
|
||||
# Number of seconds between sending events to nova if there are any events to send
|
||||
send_events_interval = <%= node["openstack"]["network"]["nova"]["send_events_interval"] %>
|
||||
|
||||
|
@ -427,6 +337,90 @@ send_events_interval = <%= node["openstack"]["network"]["nova"]["send_events_int
|
|||
# Deprecated group/name - [DEFAULT]/matchmaker_ringfile
|
||||
#ringfile=/etc/oslo/matchmaker_ring.json
|
||||
|
||||
|
||||
[oslo_concurrency]
|
||||
|
||||
# Directory to use for lock files. For security, the specified directory should
|
||||
# only be writable by the user running the processes that need locking.
|
||||
# Defaults to environment variable OSLO_LOCK_PATH. If external locks are used,
|
||||
# a lock path must be set.
|
||||
lock_path = <%= node["openstack"]["network"]["lock_path"] %>
|
||||
|
||||
# Enables or disables inter-process locks.
|
||||
# disable_process_locking = False
|
||||
|
||||
|
||||
<% if @mq_service_type == "qpid" %>
|
||||
[oslo_messaging_qpid]
|
||||
|
||||
#
|
||||
# From oslo.messaging
|
||||
#
|
||||
|
||||
# AMQP queue config options
|
||||
amqp_durable_queues=<%= node['openstack']['mq']['network']['durable_queues'] %>
|
||||
amqp_auto_delete=<%= node['openstack']['mq']['network']['auto_delete'] %>
|
||||
|
||||
##### QPID #####
|
||||
rpc_backend=neutron.openstack.common.rpc.impl_qpid
|
||||
qpid_hostname=<%= node["openstack"]["mq"]["network"]["qpid"]["host"] %>
|
||||
qpid_port=<%= node["openstack"]["mq"]["network"]["qpid"]["port"] %>
|
||||
qpid_password=<%= @mq_password %>
|
||||
qpid_username=<%= node["openstack"]["mq"]["network"]["qpid"]["username"] %>
|
||||
qpid_sasl_mechanisms=<%= node["openstack"]["mq"]["network"]["qpid"]["sasl_mechanisms"] %>
|
||||
qpid_reconnect=<%= node["openstack"]["mq"]["network"]["qpid"]["reconnect"] %>
|
||||
qpid_reconnect_timeout=<%= node["openstack"]["mq"]["network"]["qpid"]["reconnect_timeout"] %>
|
||||
qpid_reconnect_limit=<%= node["openstack"]["mq"]["network"]["qpid"]["reconnect_limit"] %>
|
||||
qpid_reconnect_interval_min=<%= node["openstack"]["mq"]["network"]["qpid"]["reconnect_interval_min"] %>
|
||||
qpid_reconnect_interval_max=<%= node["openstack"]["mq"]["network"]["qpid"]["reconnect_interval_max"] %>
|
||||
qpid_reconnect_interval=<%= node["openstack"]["mq"]["network"]["qpid"]["reconnect_interval"] %>
|
||||
qpid_heartbeat=<%= node["openstack"]["mq"]["network"]["qpid"]["heartbeat"] %>
|
||||
# qpid protocol. default 'tcp'. set to 'ssl' to enable SSL
|
||||
qpid_protocol=<%= node["openstack"]["mq"]["network"]["qpid"]["protocol"] %>
|
||||
qpid_tcp_nodelay=<%= node["openstack"]["mq"]["network"]["qpid"]["tcp_nodelay"] %>
|
||||
qpid_topology_version=<%= node['openstack']['mq']['network']['qpid']['topology_version'] %>
|
||||
<% end %>
|
||||
|
||||
|
||||
<% if @mq_service_type == "rabbitmq" %>
|
||||
[oslo_messaging_rabbit]
|
||||
|
||||
#
|
||||
# From oslo.messaging
|
||||
#
|
||||
|
||||
# AMQP queue config options
|
||||
amqp_durable_queues=<%= node['openstack']['mq']['network']['durable_queues'] %>
|
||||
amqp_auto_delete=<%= node['openstack']['mq']['network']['auto_delete'] %>
|
||||
|
||||
<% if node["openstack"]["mq"]["network"]["rabbit"]["use_ssl"] && node["openstack"]["mq"]["network"]["rabbit"]["kombu_ssl_version"] %>
|
||||
kombu_ssl_version=<%= node["openstack"]["mq"]["network"]["rabbit"]["kombu_ssl_version"] %>
|
||||
<% end -%>
|
||||
|
||||
##### RABBITMQ #####
|
||||
rpc_backend=neutron.openstack.common.rpc.impl_kombu
|
||||
rabbit_userid=<%= node["openstack"]["mq"]["network"]["rabbit"]["userid"] %>
|
||||
rabbit_password=<%= @mq_password %>
|
||||
rabbit_virtual_host=<%= node["openstack"]["mq"]["network"]["rabbit"]["vhost"] %>
|
||||
<% if node["openstack"]["mq"]["network"]["rabbit"]["ha"] %>
|
||||
# Use HA queues in RabbitMQ (x-ha-policy: all).You need to
|
||||
# wipe RabbitMQ database when changing this option. (boolean value)
|
||||
rabbit_hosts=<%= @rabbit_hosts %>
|
||||
rabbit_ha_queues=True
|
||||
rabbit_use_ssl=<%= node["openstack"]["mq"]["network"]["rabbit"]["use_ssl"] %>
|
||||
<% else %>
|
||||
rabbit_host=<%= node["openstack"]["mq"]["network"]["rabbit"]["host"] %>
|
||||
rabbit_port=<%= node["openstack"]["mq"]["network"]["rabbit"]["port"] %>
|
||||
rabbit_use_ssl=<%= node["openstack"]["mq"]["network"]["rabbit"]["use_ssl"] %>
|
||||
<% end %>
|
||||
# Maximum retries with trying to connect to RabbitMQ
|
||||
# (the default of 0 implies an infinite retry count)
|
||||
rabbit_max_retries=<%= node["openstack"]["mq"]["network"]["rabbit"]["rabbit_max_retries"] %>
|
||||
# RabbitMQ connection retry interval
|
||||
rabbit_retry_interval=<%= node["openstack"]["mq"]["network"]["rabbit"]["rabbit_retry_interval"] %>
|
||||
<% end %>
|
||||
|
||||
|
||||
[quotas]
|
||||
# Default driver to use for quota checks
|
||||
# quota_driver = neutron.db.quota_db.DbQuotaDriver
|
||||
|
@ -578,6 +572,46 @@ connection_trace = <%= node['openstack']['db']['network']['connection_trace'] %>
|
|||
# If set, use this value for pool_timeout with sqlalchemy
|
||||
pool_timeout = <%= node['openstack']['db']['network']['pool_timeout'] %>
|
||||
|
||||
[nova]
|
||||
|
||||
# Name of the plugin to load
|
||||
auth_plugin = <%= node['openstack']['network']['nova']['auth_plugin'] %>
|
||||
|
||||
# Boolean to control ignoring SSL errors on the nova url
|
||||
# insecure = False
|
||||
insecure = <%= node['openstack']['network']['nova']['insecure'] %>
|
||||
|
||||
# URL for connection to nova (Only supports one nova region currently).
|
||||
url = <%= @nova_endpoint %>
|
||||
|
||||
# Username for connection to nova in admin context
|
||||
admin_username = <%= node["openstack"]["network"]["nova"]["admin_username"] %>
|
||||
|
||||
<% if node['openstack']['network']['nova']['admin_tenant_id'] -%>
|
||||
# The uuid of the admin nova tenant
|
||||
admin_tenant_id = <%= node["openstack"]["network"]["nova"]["admin_tenant_id"] %>
|
||||
<% end -%>
|
||||
|
||||
# The name of the admin nova tenant. If the uuid of the admin nova tenant
|
||||
# is set, this is optional.
|
||||
admin_tenant_name = <%= node["openstack"]["network"]["nova"]["admin_tenant_name"] %>
|
||||
|
||||
# Password for connection to nova in admin context.
|
||||
admin_password = <%= @nova_admin_pass %>
|
||||
|
||||
# Authorization URL for connection to nova in admin context.
|
||||
admin_auth_url = <%= @identity_admin_endpoint.to_s %>
|
||||
|
||||
# Name of nova region to use. Useful if keystone manages more than one region
|
||||
region_name = <%= node["openstack"]["network"]["nova"]["region_name"] %>
|
||||
|
||||
# CA file for novaclient to verify server certificates
|
||||
<% if node['openstack']['network']['nova']['cafile'] -%>
|
||||
cafile = <%= node['openstack']['network']['nova']['cafile'] %>
|
||||
<% else -%>
|
||||
# cafile =
|
||||
<% end -%>
|
||||
|
||||
[service_providers]
|
||||
# Specify service providers (drivers) for advanced services like loadbalancer, VPN, Firewall.
|
||||
# Must be in form:
|
||||
|
|
Loading…
Reference in New Issue