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: I6b5d930257d2dfa39fda51ccf37695fb442d88e4
This commit is contained in:
wenchma
parent
a29ad4be74
commit
e97ccc7484
|
|
@ -107,7 +107,7 @@ default['openstack']['compute']['rootwrap']['syslog_log_level'] = 'ERROR'
|
|||
# If True, this indicates that glance-api allows the client to perform
|
||||
# insecure SSL(https) requests; this should be the same as the setting
|
||||
# in the glance-api service.
|
||||
default['openstack']['compute']['image']['glance_api_insecure'] = false
|
||||
default['openstack']['compute']['image']['glance_insecure'] = false
|
||||
|
||||
# CA certificate file to use to verify connecting clients
|
||||
default['openstack']['compute']['image']['ssl']['ca_file'] = nil
|
||||
|
|
@ -122,7 +122,7 @@ default['openstack']['compute']['image']['ssl']['key_file'] = nil
|
|||
# If True, this indicates that neutron api allows the client to perform
|
||||
# insecure SSL (https) requests. This should be the same as the setting
|
||||
# in the neutron api service.
|
||||
default['openstack']['compute']['network']['neutron']['api_insecure'] = false
|
||||
default['openstack']['compute']['network']['neutron']['insecure'] = false
|
||||
default['openstack']['compute']['network']['neutron']['network_api_class'] = 'nova.network.neutronv2.api.API'
|
||||
default['openstack']['compute']['network']['neutron']['auth_strategy'] = 'keystone'
|
||||
default['openstack']['compute']['network']['neutron']['admin_tenant_name'] = 'service'
|
||||
|
|
@ -135,7 +135,7 @@ default['openstack']['compute']['network']['neutron']['metadata_secret_name'] =
|
|||
default['openstack']['compute']['network']['neutron']['public_network_name'] = 'public'
|
||||
default['openstack']['compute']['network']['neutron']['dns_server'] = '8.8.8.8'
|
||||
# Timeout value for connecting to neutron in seconds
|
||||
default['openstack']['compute']['network']['neutron']['url_timeout'] = 30
|
||||
default['openstack']['compute']['network']['neutron']['timeout'] = 30
|
||||
# Region name for connecting to neutron in admin context
|
||||
default['openstack']['compute']['network']['neutron']['region_name'] = nil
|
||||
# Name of Integration Bridge used by Open vSwitch
|
||||
|
|
@ -143,7 +143,7 @@ default['openstack']['compute']['network']['neutron']['ovs_bridge'] = 'br-int'
|
|||
# Number of seconds before querying neutron for extensions
|
||||
default['openstack']['compute']['network']['neutron']['extension_sync_interval'] = 600
|
||||
# Location of CA certificates file to use for neutron client requests
|
||||
default['openstack']['compute']['network']['neutron']['ca_certificates_file'] = nil
|
||||
default['openstack']['compute']['network']['neutron']['cafile'] = nil
|
||||
|
||||
# TODO(shep): This should probably be ['openstack']['compute']['network']['fixed']
|
||||
default['openstack']['compute']['networks'] = [
|
||||
|
|
@ -325,10 +325,10 @@ default['openstack']['compute']['config']['volume_api_class'] = 'nova.volume.cin
|
|||
|
||||
# Cinder options
|
||||
# Location of ca certificates file to use for cinder client requests.
|
||||
default['openstack']['compute']['block-storage']['cinder_ca_certificates_file'] = nil
|
||||
default['openstack']['compute']['block-storage']['cinder_cafile'] = nil
|
||||
|
||||
# Allow to perform insecure SSL requests to cinder
|
||||
default['openstack']['compute']['block-storage']['cinder_api_insecure'] = false
|
||||
default['openstack']['compute']['block-storage']['cinder_insecure'] = false
|
||||
|
||||
# Info to match when looking for cinder in the service catalog
|
||||
default['openstack']['compute']['block-storage']['cinder_catalog_info'] = 'volumev2:cinderv2:publicURL'
|
||||
|
|
|
|||
|
|
@ -46,11 +46,11 @@ describe 'openstack-compute::network' do
|
|||
/^admin_username=neutron$/,
|
||||
/^admin_password=neutron-pass$/,
|
||||
%r{^admin_auth_url=http://127.0.0.1:5000/v2.0$},
|
||||
/^url_timeout=30$/,
|
||||
/^timeout=30$/,
|
||||
/^region_name=$/,
|
||||
/^ovs_bridge=br-int$/,
|
||||
/^extension_sync_interval=600$/,
|
||||
/^ca_certificates_file=$/,
|
||||
/^cafile=$/,
|
||||
/^service_metadata_proxy=true$/,
|
||||
/^metadata_proxy_shared_secret=metadata-secret$/
|
||||
].each do |line|
|
||||
|
|
|
|||
|
|
@ -160,9 +160,7 @@ describe 'openstack-compute::nova-common' do
|
|||
[/^rpc_backend=nova.openstack.common.rpc.impl_kombu$/,
|
||||
/^rpc_thread_pool_size=64$/,
|
||||
/^rpc_conn_pool_size=30$/,
|
||||
/^rpc_response_timeout=60$/,
|
||||
/^amqp_durable_queues=false$/,
|
||||
/^amqp_auto_delete=false$/].each do |line|
|
||||
/^rpc_response_timeout=60$/].each do |line|
|
||||
expect(chef_run).to render_file(file.name).with_content(line)
|
||||
end
|
||||
end
|
||||
|
|
@ -267,8 +265,8 @@ describe 'openstack-compute::nova-common' do
|
|||
end
|
||||
|
||||
[
|
||||
/^ca_certificates_file=$/,
|
||||
/^api_insecure=false/,
|
||||
/^cafile=$/,
|
||||
/^insecure=false/,
|
||||
/^catalog_info=volumev2:cinderv2:publicURL$/
|
||||
].each do |line|
|
||||
expect(chef_run).to render_config_file(file.name)\
|
||||
|
|
@ -276,7 +274,7 @@ describe 'openstack-compute::nova-common' do
|
|||
end
|
||||
|
||||
[
|
||||
/^api_insecure=false$/,
|
||||
/^insecure=false$/,
|
||||
%r{^api_servers=http://127.0.0.1:9292$}
|
||||
].each do |line|
|
||||
expect(chef_run).to render_config_file(file.name)\
|
||||
|
|
@ -298,7 +296,7 @@ describe 'openstack-compute::nova-common' do
|
|||
it 'sets service_type to neutron' do
|
||||
node.set['openstack']['compute']['network']['service_type'] = 'neutron'
|
||||
[
|
||||
/^api_insecure=false$/,
|
||||
/^insecure=false$/,
|
||||
%r{^url=http://127.0.0.1:9696$}
|
||||
].each do |line|
|
||||
expect(chef_run).to render_config_file(file.name)\
|
||||
|
|
@ -308,23 +306,23 @@ describe 'openstack-compute::nova-common' do
|
|||
|
||||
it 'sets service_type and insecure and scheme for neutron' do
|
||||
node.set['openstack']['compute']['network']['service_type'] = 'neutron'
|
||||
node.set['openstack']['compute']['network']['neutron']['api_insecure'] = true
|
||||
node.set['openstack']['compute']['network']['neutron']['insecure'] = true
|
||||
node.set['openstack']['endpoints']['network-api']['scheme'] = 'https'
|
||||
expect(chef_run).to render_config_file(file.name)\
|
||||
.with_section_content('neutron', /^api_insecure=true$/)
|
||||
.with_section_content('neutron', /^insecure=true$/)
|
||||
expect(chef_run).to render_config_file(file.name)\
|
||||
.with_section_content('neutron', %r{^url=https://127.0.0.1:9696$})
|
||||
end
|
||||
|
||||
it 'sets scheme and insecure for glance' do
|
||||
node.set['openstack']['endpoints']['image-api']['scheme'] = 'https'
|
||||
node.set['openstack']['compute']['image']['glance_api_insecure'] = true
|
||||
node.set['openstack']['compute']['image']['glance_insecure'] = true
|
||||
node.set['openstack']['compute']['image']['ssl']['ca_file'] = 'dir/to/path'
|
||||
node.set['openstack']['compute']['image']['ssl']['cert_file'] = 'dir/to/path2'
|
||||
node.set['openstack']['compute']['image']['ssl']['key_file'] = 'dir/to/path3'
|
||||
|
||||
[
|
||||
/^api_insecure=true$/,
|
||||
/^insecure=true$/,
|
||||
%r{^api_servers=https://127.0.0.1:9292$}
|
||||
].each do |line|
|
||||
expect(chef_run).to render_config_file(file.name)\
|
||||
|
|
@ -342,13 +340,13 @@ describe 'openstack-compute::nova-common' do
|
|||
end
|
||||
|
||||
it 'sets cinder options' do
|
||||
node.set['openstack']['compute']['block-storage']['cinder_ca_certificates_file'] = 'dir/to/path'
|
||||
node.set['openstack']['compute']['block-storage']['cinder_api_insecure'] = true
|
||||
node.set['openstack']['compute']['block-storage']['cinder_cafile'] = 'dir/to/path'
|
||||
node.set['openstack']['compute']['block-storage']['cinder_insecure'] = true
|
||||
node.set['openstack']['compute']['block-storage']['cinder_catalog_info'] = 'volume:cinder:publicURL'
|
||||
|
||||
[
|
||||
/^api_insecure=true$/,
|
||||
%r{^ca_certificates_file=dir/to/path$},
|
||||
/^insecure=true$/,
|
||||
%r{^cafile=dir/to/path$},
|
||||
/^catalog_info=volume:cinder:publicURL$/
|
||||
].each do |line|
|
||||
expect(chef_run).to render_config_file(file.name)\
|
||||
|
|
@ -405,17 +403,18 @@ describe 'openstack-compute::nova-common' do
|
|||
end
|
||||
|
||||
it 'has default rabbit_* options set' do
|
||||
[/^rabbit_userid=guest$/, /^rabbit_password=mq-pass$/,
|
||||
[/^amqp_durable_queues=false$/, /^amqp_auto_delete=false$/,
|
||||
/^rabbit_userid=guest$/, /^rabbit_password=mq-pass$/,
|
||||
/^rabbit_virtual_host=\/$/, /^rabbit_host=127.0.0.1$/,
|
||||
/^rabbit_port=5672$/, /^rabbit_use_ssl=false$/].each do |line|
|
||||
expect(chef_run).to render_file(file.name).with_content(line)
|
||||
expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', line)
|
||||
end
|
||||
end
|
||||
|
||||
it 'does not have ha rabbit options set' do
|
||||
[/^rabbit_hosts=/, /^rabbit_ha_queues=/,
|
||||
/^ec2_private_dns_show_ip$/].each do |line|
|
||||
expect(chef_run).not_to render_file(file.name).with_content(line)
|
||||
expect(chef_run).not_to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', line)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -433,26 +432,26 @@ describe 'openstack-compute::nova-common' do
|
|||
/^rabbit_ha_queues=True$/,
|
||||
/^rabbit_use_ssl=false$/
|
||||
].each do |line|
|
||||
expect(chef_run).to render_file(file.name).with_content(line)
|
||||
expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', line)
|
||||
end
|
||||
end
|
||||
|
||||
it 'does not have non-ha rabbit options set' do
|
||||
[/^rabbit_host=127\.0\.0\.1$/, /^rabbit_port=5672$/].each do |line|
|
||||
expect(chef_run).not_to render_file(file.name).with_content(line)
|
||||
expect(chef_run).not_to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', line)
|
||||
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.override['openstack']['mq']['compute']['rabbit']['use_ssl'] = true
|
||||
node.override['openstack']['mq']['compute']['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
|
||||
|
||||
|
|
@ -466,6 +465,8 @@ describe 'openstack-compute::nova-common' do
|
|||
|
||||
it 'has default qpid_* options set' do
|
||||
[
|
||||
/^amqp_durable_queues=false$/,
|
||||
/^amqp_auto_delete=false$/,
|
||||
/^qpid_hostname=127.0.0.1$/,
|
||||
/^qpid_port=5672$/,
|
||||
/^qpid_username=guest$/,
|
||||
|
|
@ -481,7 +482,7 @@ describe 'openstack-compute::nova-common' do
|
|||
/^qpid_tcp_nodelay=true$/,
|
||||
/^qpid_topology_version=1$/
|
||||
].each do |line|
|
||||
expect(chef_run).to render_file(file.name).with_content(line)
|
||||
expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_qpid', line)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ state_path=<%= node["openstack"]["compute"]["state_path"] %>
|
|||
instances_path=<%= node["openstack"]["compute"]["instances_path"] %>
|
||||
instance_name_template=<%= node["openstack"]["compute"]["instance_name_template"] %>
|
||||
network_allocate_retries=<%= node['openstack']['compute']['network_allocate_retries'] %>
|
||||
lock_path=<%= node["openstack"]["compute"]["lock_path"] %>
|
||||
|
||||
ssl_only=<%= node['openstack']['compute']['ssl_only'] %>
|
||||
cert=<%= node['openstack']['compute']['cert'] %>
|
||||
|
|
@ -36,46 +35,6 @@ rpc_thread_pool_size=<%= node["openstack"]["compute"]["rpc_thread_pool_size"] %>
|
|||
rpc_conn_pool_size=<%= node["openstack"]["compute"]["rpc_conn_pool_size"] %>
|
||||
rpc_response_timeout=<%= node["openstack"]["compute"]["rpc_response_timeout"] %>
|
||||
rpc_backend=<%= node["openstack"]["compute"]["rpc_backend"] %>
|
||||
amqp_durable_queues=<%= node['openstack']['mq']['compute']['durable_queues'] %>
|
||||
amqp_auto_delete=<%= node['openstack']['mq']['compute']['auto_delete'] %>
|
||||
|
||||
<% if @mq_service_type == "rabbitmq" %>
|
||||
<% if node["openstack"]["mq"]["compute"]["rabbit"]["use_ssl"] && node["openstack"]["mq"]["compute"]["rabbit"]["kombu_ssl_version"] %>
|
||||
kombu_ssl_version=<%= node["openstack"]["mq"]["compute"]["rabbit"]["kombu_ssl_version"] %>
|
||||
<% end -%>
|
||||
##### RABBITMQ #####
|
||||
rabbit_userid=<%= node["openstack"]["mq"]["compute"]["rabbit"]["userid"] %>
|
||||
rabbit_password=<%= @mq_password %>
|
||||
rabbit_virtual_host=<%= node["openstack"]["mq"]["compute"]["rabbit"]["vhost"] %>
|
||||
<% if node["openstack"]["mq"]["compute"]["rabbit"]["ha"] -%>
|
||||
rabbit_hosts=<%= @rabbit_hosts %>
|
||||
rabbit_ha_queues=True
|
||||
rabbit_use_ssl=<%= node["openstack"]["mq"]["compute"]["rabbit"]["use_ssl"] %>
|
||||
<% else -%>
|
||||
rabbit_host=<%= node["openstack"]["mq"]["compute"]["rabbit"]["host"] %>
|
||||
rabbit_port=<%= node["openstack"]["mq"]["compute"]["rabbit"]["port"] %>
|
||||
rabbit_use_ssl=<%= node["openstack"]["mq"]["compute"]["rabbit"]["use_ssl"] %>
|
||||
<% end -%>
|
||||
<% end -%>
|
||||
|
||||
<% if @mq_service_type == "qpid" %>
|
||||
##### QPID #####
|
||||
qpid_hostname=<%= node["openstack"]["mq"]["compute"]["qpid"]["host"] %>
|
||||
qpid_port=<%= node["openstack"]["mq"]["compute"]["qpid"]["port"] %>
|
||||
qpid_password=<%= @mq_password %>
|
||||
qpid_username=<%= node["openstack"]["mq"]["compute"]["qpid"]["username"] %>
|
||||
qpid_sasl_mechanisms=<%= node["openstack"]["mq"]["compute"]["qpid"]["sasl_mechanisms"] %>
|
||||
qpid_reconnect_timeout=<%= node["openstack"]["mq"]["compute"]["qpid"]["reconnect_timeout"] %>
|
||||
qpid_reconnect_limit=<%= node["openstack"]["mq"]["compute"]["qpid"]["reconnect_limit"] %>
|
||||
qpid_reconnect_interval_min=<%= node["openstack"]["mq"]["compute"]["qpid"]["reconnect_interval_min"] %>
|
||||
qpid_reconnect_interval_max=<%= node["openstack"]["mq"]["compute"]["qpid"]["reconnect_interval_max"] %>
|
||||
qpid_reconnect_interval=<%= node["openstack"]["mq"]["compute"]["qpid"]["reconnect_interval"] %>
|
||||
qpid_heartbeat=<%= node["openstack"]["mq"]["compute"]["qpid"]["heartbeat"] %>
|
||||
# qpid protocol. default 'tcp'. set to 'ssl' to enable SSL
|
||||
qpid_protocol=<%= node["openstack"]["mq"]["compute"]["qpid"]["protocol"] %>
|
||||
qpid_tcp_nodelay=<%= node["openstack"]["mq"]["compute"]["qpid"]["tcp_nodelay"] %>
|
||||
qpid_topology_version=<%= node['openstack']['mq']['compute']['qpid']['topology_version'] %>
|
||||
<% end %>
|
||||
|
||||
|
||||
##### SCHEDULER #####
|
||||
|
|
@ -131,7 +90,6 @@ use_cow_images=<%= node["openstack"]["compute"]["use_cow_images"] %>
|
|||
vif_plugging_is_fatal=<%= node["openstack"]["compute"]["vif_plugging_is_fatal"] %>
|
||||
vif_plugging_timeout=<%= node["openstack"]["compute"]["vif_plugging_timeout"] %>
|
||||
compute_manager=<%= node["openstack"]["compute"]["manager"] %>
|
||||
sql_connection=<%= @sql_connection %>
|
||||
connection_type=libvirt
|
||||
|
||||
##### NOTIFICATIONS #####
|
||||
|
|
@ -332,6 +290,123 @@ osapi_compute_extension=<%= p %>
|
|||
<% end %>
|
||||
<% end %>
|
||||
|
||||
|
||||
[database]
|
||||
|
||||
#
|
||||
# Options defined in oslo.db
|
||||
#
|
||||
|
||||
# The file name to use with SQLite. (string value)
|
||||
#sqlite_db=oslo.sqlite
|
||||
|
||||
# If True, SQLite uses synchronous mode. (boolean value)
|
||||
#sqlite_synchronous=true
|
||||
|
||||
# The back end to use for the database. (string value)
|
||||
# Deprecated group/name - [DEFAULT]/db_backend
|
||||
#backend=sqlalchemy
|
||||
|
||||
# The SQLAlchemy connection string to use to connect to the
|
||||
# database. (string value)
|
||||
# Deprecated group/name - [DEFAULT]/sql_connection
|
||||
# Deprecated group/name - [DATABASE]/sql_connection
|
||||
# Deprecated group/name - [sql]/connection
|
||||
connection=<%= @sql_connection %>
|
||||
|
||||
# The SQLAlchemy connection string to use to connect to the
|
||||
# slave database. (string value)
|
||||
#slave_connection=<None>
|
||||
|
||||
# The SQL mode to be used for MySQL sessions. This option,
|
||||
# including the default, overrides any server-set SQL mode. To
|
||||
# use whatever SQL mode is set by the server configuration,
|
||||
# set this to no value. Example: mysql_sql_mode= (string
|
||||
# value)
|
||||
#mysql_sql_mode=TRADITIONAL
|
||||
|
||||
# Timeout before idle SQL connections are reaped. (integer
|
||||
# value)
|
||||
# Deprecated group/name - [DEFAULT]/sql_idle_timeout
|
||||
# Deprecated group/name - [DATABASE]/sql_idle_timeout
|
||||
# Deprecated group/name - [sql]/idle_timeout
|
||||
#idle_timeout=3600
|
||||
|
||||
# Minimum number of SQL connections to keep open in a pool.
|
||||
# (integer value)
|
||||
# Deprecated group/name - [DEFAULT]/sql_min_pool_size
|
||||
# Deprecated group/name - [DATABASE]/sql_min_pool_size
|
||||
#min_pool_size=1
|
||||
|
||||
# Maximum number of SQL connections to keep open in a pool.
|
||||
# (integer value)
|
||||
# Deprecated group/name - [DEFAULT]/sql_max_pool_size
|
||||
# Deprecated group/name - [DATABASE]/sql_max_pool_size
|
||||
#max_pool_size=<None>
|
||||
|
||||
# Maximum number of database connection retries during
|
||||
# startup. Set to -1 to specify an infinite retry count.
|
||||
# (integer value)
|
||||
# Deprecated group/name - [DEFAULT]/sql_max_retries
|
||||
# Deprecated group/name - [DATABASE]/sql_max_retries
|
||||
#max_retries=10
|
||||
|
||||
# Interval between retries of opening a SQL connection.
|
||||
# (integer value)
|
||||
# Deprecated group/name - [DEFAULT]/sql_retry_interval
|
||||
# Deprecated group/name - [DATABASE]/reconnect_interval
|
||||
#retry_interval=10
|
||||
|
||||
# If set, use this value for max_overflow with SQLAlchemy.
|
||||
# (integer value)
|
||||
# Deprecated group/name - [DEFAULT]/sql_max_overflow
|
||||
# Deprecated group/name - [DATABASE]/sqlalchemy_max_overflow
|
||||
#max_overflow=<None>
|
||||
|
||||
# Verbosity of SQL debugging information: 0=None,
|
||||
# 100=Everything. (integer value)
|
||||
# Deprecated group/name - [DEFAULT]/sql_connection_debug
|
||||
#connection_debug=0
|
||||
|
||||
# Add Python stack traces to SQL as comment strings. (boolean
|
||||
# value)
|
||||
# Deprecated group/name - [DEFAULT]/sql_connection_trace
|
||||
#connection_trace=false
|
||||
|
||||
# If set, use this value for pool_timeout with SQLAlchemy.
|
||||
# (integer value)
|
||||
# Deprecated group/name - [DATABASE]/sqlalchemy_pool_timeout
|
||||
#pool_timeout=<None>
|
||||
|
||||
# Enable the experimental use of database reconnect on
|
||||
# connection lost. (boolean value)
|
||||
#use_db_reconnect=false
|
||||
|
||||
# Seconds between database connection retries. (integer value)
|
||||
#db_retry_interval=1
|
||||
|
||||
# If True, increases the interval between database connection
|
||||
# retries up to db_max_retry_interval. (boolean value)
|
||||
#db_inc_retry_interval=true
|
||||
|
||||
# If db_inc_retry_interval is set, the maximum seconds between
|
||||
# database connection retries. (integer value)
|
||||
#db_max_retry_interval=10
|
||||
|
||||
# Maximum database connection retries before error is raised.
|
||||
# Set to -1 to specify an infinite retry count. (integer
|
||||
# value)
|
||||
#db_max_retries=20
|
||||
|
||||
|
||||
#
|
||||
# Options defined in ironic.db.sqlalchemy.models
|
||||
#
|
||||
|
||||
# MySQL engine to use. (string value)
|
||||
#mysql_engine=InnoDB
|
||||
|
||||
|
||||
[ssl]
|
||||
|
||||
# CA certificate file to use to verify connecting clients
|
||||
|
|
@ -646,17 +721,17 @@ url=http://<%= @network_endpoint.host %>:80
|
|||
<% else -%>
|
||||
url=<%= @network_endpoint.scheme %>://<%= @network_endpoint.host %>:<%= @network_endpoint.port %>
|
||||
<% end -%>
|
||||
api_insecure=<%= node['openstack']['compute']['network']['neutron']['api_insecure'] %>
|
||||
insecure=<%= node['openstack']['compute']['network']['neutron']['insecure'] %>
|
||||
auth_strategy=<%= node["openstack"]["compute"]["network"]["neutron"]["auth_strategy"] %>
|
||||
admin_tenant_name=<%= node["openstack"]["compute"]["network"]["neutron"]["admin_tenant_name"] %>
|
||||
admin_username=<%= node["openstack"]["compute"]["network"]["neutron"]["admin_username"] %>
|
||||
admin_password=<%= @neutron_admin_password %>
|
||||
admin_auth_url=<%= @identity_endpoint.to_s %>
|
||||
url_timeout=<%= node["openstack"]["compute"]["network"]["neutron"]["url_timeout"] %>
|
||||
timeout=<%= node["openstack"]["compute"]["network"]["neutron"]["timeout"] %>
|
||||
region_name=<%= node["openstack"]["compute"]["network"]["neutron"]["region_name"] %>
|
||||
ovs_bridge=<%= node["openstack"]["compute"]["network"]["neutron"]["ovs_bridge"] %>
|
||||
extension_sync_interval=<%= node["openstack"]["compute"]["network"]["neutron"]["extension_sync_interval"] %>
|
||||
ca_certificates_file=<%= node["openstack"]["compute"]["network"]["neutron"]["ca_certificates_file"] %>
|
||||
cafile=<%= node["openstack"]["compute"]["network"]["neutron"]["cafile"] %>
|
||||
service_metadata_proxy=<%= node["openstack"]["compute"]["network"]["neutron"]["service_neutron_metadata_proxy"] %>
|
||||
metadata_proxy_shared_secret=<%= @neutron_metadata_proxy_shared_secret %>
|
||||
|
||||
|
|
@ -664,14 +739,14 @@ metadata_proxy_shared_secret=<%= @neutron_metadata_proxy_shared_secret %>
|
|||
|
||||
[glance]
|
||||
api_servers=<%= @glance_api_scheme %>://<%= @glance_api_ipaddress %>:<%= @glance_api_port %>
|
||||
api_insecure=<%= node['openstack']['compute']['image']['glance_api_insecure'] %>
|
||||
insecure=<%= node['openstack']['compute']['image']['glance_insecure'] %>
|
||||
|
||||
[cinder]
|
||||
# Location of ca certificates file to use for cinder client requests
|
||||
ca_certificates_file=<%= node['openstack']['compute']['block-storage']['cinder_ca_certificates_file'] %>
|
||||
cafile=<%= node['openstack']['compute']['block-storage']['cinder_cafile'] %>
|
||||
|
||||
# Allow to perform insecure SSL requests to cinder
|
||||
api_insecure=<%= node['openstack']['compute']['block-storage']['cinder_api_insecure'] %>
|
||||
insecure=<%= node['openstack']['compute']['block-storage']['cinder_insecure'] %>
|
||||
|
||||
# Info to match when looking for cinder in the service catalog
|
||||
catalog_info=<%= node['openstack']['compute']['block-storage']['cinder_catalog_info'] %>
|
||||
|
|
@ -705,6 +780,76 @@ admin_url=<%= @identity_endpoint.to_s %>
|
|||
# Ironic keystone tenant name. (string value)
|
||||
admin_tenant_name=<%= node['openstack']['compute']['bare-metal']['admin_tenant_name'] %>
|
||||
|
||||
|
||||
[oslo_concurrency]
|
||||
|
||||
lock_path=<%= node["openstack"]["compute"]["lock_path"] %>
|
||||
|
||||
|
||||
[oslo_messaging_qpid]
|
||||
|
||||
#
|
||||
# From oslo.messaging
|
||||
#
|
||||
|
||||
<% if @mq_service_type == "qpid" %>
|
||||
# Use durable queues in AMQP. (boolean value)
|
||||
# Deprecated group/name - [DEFAULT]/rabbit_durable_queues
|
||||
amqp_durable_queues=<%= node['openstack']['mq']['compute']['durable_queues'] %>
|
||||
|
||||
# Auto-delete queues in AMQP. (boolean value)
|
||||
amqp_auto_delete=<%= node['openstack']['mq']['compute']['auto_delete'] %>
|
||||
|
||||
##### QPID #####
|
||||
qpid_hostname=<%= node["openstack"]["mq"]["compute"]["qpid"]["host"] %>
|
||||
qpid_port=<%= node["openstack"]["mq"]["compute"]["qpid"]["port"] %>
|
||||
qpid_password=<%= @mq_password %>
|
||||
qpid_username=<%= node["openstack"]["mq"]["compute"]["qpid"]["username"] %>
|
||||
qpid_sasl_mechanisms=<%= node["openstack"]["mq"]["compute"]["qpid"]["sasl_mechanisms"] %>
|
||||
qpid_reconnect_timeout=<%= node["openstack"]["mq"]["compute"]["qpid"]["reconnect_timeout"] %>
|
||||
qpid_reconnect_limit=<%= node["openstack"]["mq"]["compute"]["qpid"]["reconnect_limit"] %>
|
||||
qpid_reconnect_interval_min=<%= node["openstack"]["mq"]["compute"]["qpid"]["reconnect_interval_min"] %>
|
||||
qpid_reconnect_interval_max=<%= node["openstack"]["mq"]["compute"]["qpid"]["reconnect_interval_max"] %>
|
||||
qpid_reconnect_interval=<%= node["openstack"]["mq"]["compute"]["qpid"]["reconnect_interval"] %>
|
||||
qpid_heartbeat=<%= node["openstack"]["mq"]["compute"]["qpid"]["heartbeat"] %>
|
||||
# qpid protocol. default 'tcp'. set to 'ssl' to enable SSL
|
||||
qpid_protocol=<%= node["openstack"]["mq"]["compute"]["qpid"]["protocol"] %>
|
||||
qpid_tcp_nodelay=<%= node["openstack"]["mq"]["compute"]["qpid"]["tcp_nodelay"] %>
|
||||
qpid_topology_version=<%= node['openstack']['mq']['compute']['qpid']['topology_version'] %>
|
||||
<% end %>
|
||||
|
||||
[oslo_messaging_rabbit]
|
||||
|
||||
#
|
||||
# From oslo.messaging
|
||||
#
|
||||
|
||||
<% if @mq_service_type == "rabbitmq" %>
|
||||
# Use durable queues in AMQP. (boolean value)
|
||||
# Deprecated group/name - [DEFAULT]/rabbit_durable_queues
|
||||
amqp_durable_queues=<%= node['openstack']['mq']['compute']['durable_queues'] %>
|
||||
|
||||
# Auto-delete queues in AMQP. (boolean value)
|
||||
amqp_auto_delete=<%= node['openstack']['mq']['compute']['auto_delete'] %>
|
||||
|
||||
<% if node["openstack"]["mq"]["compute"]["rabbit"]["use_ssl"] && node["openstack"]["mq"]["compute"]["rabbit"]["kombu_ssl_version"] %>
|
||||
kombu_ssl_version=<%= node["openstack"]["mq"]["compute"]["rabbit"]["kombu_ssl_version"] %>
|
||||
<% end -%>
|
||||
##### RABBITMQ #####
|
||||
rabbit_userid=<%= node["openstack"]["mq"]["compute"]["rabbit"]["userid"] %>
|
||||
rabbit_password=<%= @mq_password %>
|
||||
rabbit_virtual_host=<%= node["openstack"]["mq"]["compute"]["rabbit"]["vhost"] %>
|
||||
<% if node["openstack"]["mq"]["compute"]["rabbit"]["ha"] -%>
|
||||
rabbit_hosts=<%= @rabbit_hosts %>
|
||||
rabbit_ha_queues=True
|
||||
rabbit_use_ssl=<%= node["openstack"]["mq"]["compute"]["rabbit"]["use_ssl"] %>
|
||||
<% else -%>
|
||||
rabbit_host=<%= node["openstack"]["mq"]["compute"]["rabbit"]["host"] %>
|
||||
rabbit_port=<%= node["openstack"]["mq"]["compute"]["rabbit"]["port"] %>
|
||||
rabbit_use_ssl=<%= node["openstack"]["mq"]["compute"]["rabbit"]["use_ssl"] %>
|
||||
<% end -%>
|
||||
<% end -%>
|
||||
|
||||
<% if node['openstack']['compute']['upgrade_levels'] -%>
|
||||
# Lock the version of RPC messages and allow live upgrading of the services
|
||||
# without interruption caused by version mismatch.
|
||||
|
|
|
|||
Loading…
Reference in New Issue