Drop commented out values from configs
To make configs more readable it's worth dropping out commented out lines. Also some issues in configs has been fixed. Change-Id: I1d2316fbe9ae0c74b9d516d3a143c7a58ff59365
This commit is contained in:
Dmitriy Rabotyagov
parent
7ee1939c1c
commit
a240a29b80
@ -1,268 +1,37 @@
|
|||||||
[DEFAULT]
|
[DEFAULT]
|
||||||
|
|
||||||
#
|
debug = {{ debug | bool }}
|
||||||
# From kuryr_libnetwork
|
use_stderr = false
|
||||||
#
|
use_journal = true
|
||||||
|
|
||||||
# Directory where Kuryr python module is installed. (string value)
|
# Directory for Kuryr vif binding executables. (string value)
|
||||||
pybasedir = {{ zun_bin }}/../lib/python2.7/site-packages/kuryr_libnetwork
|
bindir = {{ zun_bin | dirname }}/libexec/kuryr
|
||||||
|
|
||||||
# Kuryr URL for accessing Kuryr through json rpc. (string value)
|
# Kuryr URL for accessing Kuryr through json rpc. (string value)
|
||||||
#kuryr_uri = http://127.0.0.1:23750
|
kuryr_uri = http://{{ zun_kuryr_service_address }}:{{ zun_kuryr_service_port }}
|
||||||
|
|
||||||
# Kuryr plugin scope reported to libnetwork. (string value)
|
# Kuryr plugin scope reported to libnetwork. (string value)
|
||||||
# Possible values:
|
|
||||||
# local - <No description provided>
|
|
||||||
# global - <No description provided>
|
|
||||||
capability_scope = global
|
capability_scope = global
|
||||||
|
|
||||||
# There is no address-space by default in neutron (string value)
|
|
||||||
#local_default_address_space = no_address_space
|
|
||||||
|
|
||||||
# There is no address-space by default in neutron (string value)
|
|
||||||
#global_default_address_space = no_address_space
|
|
||||||
|
|
||||||
# DEPRECATED: Default driver for the desired deployment model (string value)
|
|
||||||
# This option is deprecated for removal.
|
|
||||||
# Its value may be silently ignored in the future.
|
|
||||||
#port_driver = kuryr_libnetwork.port_driver.drivers.veth
|
|
||||||
|
|
||||||
# Default driver for the desired deployment model (string value)
|
|
||||||
#default_port_driver = kuryr_libnetwork.port_driver.drivers.veth
|
|
||||||
|
|
||||||
# Available port drivers (list value)
|
|
||||||
#enabled_port_drivers = kuryr_libnetwork.port_driver.drivers.veth
|
|
||||||
|
|
||||||
# Do processing external connectivity (boolean value)
|
# Do processing external connectivity (boolean value)
|
||||||
process_external_connectivity = false
|
process_external_connectivity = false
|
||||||
|
|
||||||
# This option allows setting absolute pathto the SSL certificate (string value)
|
|
||||||
#ssl_cert_file = /var/lib/kuryr/certs/cert.pem
|
|
||||||
|
|
||||||
# This option allows setting absolute pathto the SSL private key (string value)
|
|
||||||
#ssl_key_file = /var/lib/kuryr/certs/key.pem
|
|
||||||
|
|
||||||
# Enable SSL for Kuryr (boolean value)
|
|
||||||
#enable_ssl = false
|
|
||||||
|
|
||||||
# If set to true, the logging level will be set to DEBUG instead of the default
|
|
||||||
# INFO level. (boolean value)
|
|
||||||
# Note: This option can be changed without restarting.
|
|
||||||
#debug = false
|
|
||||||
|
|
||||||
# The name of a logging configuration file. This file is appended to any
|
|
||||||
# existing logging configuration files. For details about logging configuration
|
|
||||||
# files, see the Python logging module documentation. Note that when logging
|
|
||||||
# configuration files are used then all logging configuration is set in the
|
|
||||||
# configuration file and other logging configuration options are ignored (for
|
|
||||||
# example, logging_context_format_string). (string value)
|
|
||||||
# Note: This option can be changed without restarting.
|
|
||||||
# Deprecated group/name - [DEFAULT]/log_config
|
|
||||||
#log_config_append = <None>
|
|
||||||
|
|
||||||
# Defines the format string for %%(asctime)s in log records. Default:
|
|
||||||
# %(default)s . This option is ignored if log_config_append is set. (string
|
|
||||||
# value)
|
|
||||||
#log_date_format = %Y-%m-%d %H:%M:%S
|
|
||||||
|
|
||||||
# (Optional) Name of log file to send logging output to. If no default is set,
|
|
||||||
# logging will go to stderr as defined by use_stderr. This option is ignored if
|
|
||||||
# log_config_append is set. (string value)
|
|
||||||
# Deprecated group/name - [DEFAULT]/logfile
|
|
||||||
#log_file = <None>
|
|
||||||
|
|
||||||
# (Optional) The base directory used for relative log_file paths. This option
|
|
||||||
# is ignored if log_config_append is set. (string value)
|
|
||||||
# Deprecated group/name - [DEFAULT]/logdir
|
|
||||||
#log_dir = <None>
|
|
||||||
|
|
||||||
# Uses logging handler designed to watch file system. When log file is moved or
|
|
||||||
# removed this handler will open a new log file with specified path
|
|
||||||
# instantaneously. It makes sense only if log_file option is specified and
|
|
||||||
# Linux platform is used. This option is ignored if log_config_append is set.
|
|
||||||
# (boolean value)
|
|
||||||
#watch_log_file = false
|
|
||||||
|
|
||||||
# Use syslog for logging. Existing syslog format is DEPRECATED and will be
|
|
||||||
# changed later to honor RFC5424. This option is ignored if log_config_append
|
|
||||||
# is set. (boolean value)
|
|
||||||
#use_syslog = false
|
|
||||||
|
|
||||||
# Enable journald for logging. If running in a systemd environment you may wish
|
|
||||||
# to enable journal support. Doing so will use the journal native protocol
|
|
||||||
# which includes structured metadata in addition to log messages.This option is
|
|
||||||
# ignored if log_config_append is set. (boolean value)
|
|
||||||
#use_journal = false
|
|
||||||
|
|
||||||
# Syslog facility to receive log lines. This option is ignored if
|
|
||||||
# log_config_append is set. (string value)
|
|
||||||
#syslog_log_facility = LOG_USER
|
|
||||||
|
|
||||||
# Use JSON formatting for logging. This option is ignored if log_config_append
|
|
||||||
# is set. (boolean value)
|
|
||||||
#use_json = false
|
|
||||||
|
|
||||||
# Log output to standard error. This option is ignored if log_config_append is
|
|
||||||
# set. (boolean value)
|
|
||||||
#use_stderr = false
|
|
||||||
|
|
||||||
# Directory for Kuryr vif binding executables. (string value)
|
|
||||||
bindir = {{ zun_bin }}/../libexec/kuryr
|
|
||||||
|
|
||||||
# Neutron subnetpool name will be prefixed by this. (string value)
|
|
||||||
#subnetpool_name_prefix = kuryrPool
|
|
||||||
|
|
||||||
# baremetal or nested-containers are the supported values. (string value)
|
|
||||||
#deployment_type = baremetal
|
|
||||||
|
|
||||||
|
|
||||||
[binding]
|
[binding]
|
||||||
# Configuration options for container interface binding.
|
|
||||||
|
|
||||||
#
|
|
||||||
# From kuryr_libnetwork
|
|
||||||
#
|
|
||||||
|
|
||||||
# The name prefix of the veth endpoint put inside the container. (string value)
|
# The name prefix of the veth endpoint put inside the container. (string value)
|
||||||
veth_dst_prefix = veth
|
veth_dst_prefix = veth
|
||||||
|
|
||||||
# Driver to use for binding and unbinding ports. (string value)
|
|
||||||
# Deprecated group/name - [binding]/driver
|
|
||||||
#default_driver = kuryr.lib.binding.drivers.veth
|
|
||||||
|
|
||||||
# Drivers to use for binding and unbinding ports. (list value)
|
|
||||||
#enabled_drivers = kuryr.lib.binding.drivers.veth
|
|
||||||
|
|
||||||
# Specifies the name of the Nova instance interface to link the virtual devices
|
|
||||||
# to (only applicable to some binding drivers. (string value)
|
|
||||||
#link_iface =
|
|
||||||
|
|
||||||
|
|
||||||
[neutron]
|
[neutron]
|
||||||
# Configuration options for OpenStack Neutron
|
# Configuration options for OpenStack Neutron
|
||||||
|
|
||||||
#
|
|
||||||
# From kuryr_libnetwork
|
|
||||||
#
|
|
||||||
|
|
||||||
# Authentication URL (string value)
|
|
||||||
#auth_url = <None>
|
|
||||||
auth_url = {{ keystone_service_adminurl }}
|
auth_url = {{ keystone_service_adminurl }}
|
||||||
|
|
||||||
# Authentication type to load (string value)
|
|
||||||
# Deprecated group/name - [neutron]/auth_plugin
|
|
||||||
#auth_type = <None>
|
|
||||||
auth_type = {{ zun_keystone_auth_plugin }}
|
auth_type = {{ zun_keystone_auth_plugin }}
|
||||||
|
|
||||||
# PEM encoded Certificate Authority to use when verifying HTTPs connections.
|
|
||||||
# (string value)
|
|
||||||
#cafile = <None>
|
|
||||||
|
|
||||||
# PEM encoded client certificate cert file (string value)
|
|
||||||
#certfile = <None>
|
|
||||||
|
|
||||||
# Collect per-API call timing information. (boolean value)
|
|
||||||
#collect_timing = false
|
|
||||||
|
|
||||||
# Optional domain ID to use with v3 and v2 parameters. It will be used for both
|
|
||||||
# the user and project domain in v3 and ignored in v2 authentication. (string
|
|
||||||
# value)
|
|
||||||
#default_domain_id = <None>
|
|
||||||
|
|
||||||
# Optional domain name to use with v3 API and v2 parameters. It will be used
|
|
||||||
# for both the user and project domain in v3 and ignored in v2 authentication.
|
|
||||||
# (string value)
|
|
||||||
#default_domain_name = <None>
|
|
||||||
|
|
||||||
# Name of default subnetpool version 4 (string value)
|
|
||||||
#default_subnetpool_v4 = kuryr
|
|
||||||
|
|
||||||
# Name of default subnetpool version 6 (string value)
|
|
||||||
#default_subnetpool_v6 = kuryr6
|
|
||||||
|
|
||||||
# Domain ID to scope to (string value)
|
|
||||||
#domain_id = <None>
|
|
||||||
|
|
||||||
# Domain name to scope to (string value)
|
|
||||||
#domain_name = <None>
|
|
||||||
|
|
||||||
# Enable or Disable dhcp for neutron subnets. (string value)
|
|
||||||
#enable_dhcp = True
|
|
||||||
|
|
||||||
# Type of the neutron endpoint to use. This endpoint will be looked up in the
|
|
||||||
# keystone catalog and should be one of public, internal or admin. (string
|
|
||||||
# value)
|
|
||||||
# Possible values:
|
|
||||||
# public - <No description provided>
|
|
||||||
# admin - <No description provided>
|
|
||||||
# internal - <No description provided>
|
|
||||||
endpoint_type = internal
|
endpoint_type = internal
|
||||||
|
|
||||||
# Verify HTTPS connections. (boolean value)
|
|
||||||
insecure = {{ keystone_service_internaluri_insecure | bool }}
|
insecure = {{ keystone_service_internaluri_insecure | bool }}
|
||||||
|
password = {{ zun_kuryr_service_password }}
|
||||||
# PEM encoded client certificate key file (string value)
|
|
||||||
#keyfile = <None>
|
|
||||||
|
|
||||||
# User's password (string value)
|
|
||||||
#password = <None>
|
|
||||||
password = {{ zun_service_password }}
|
|
||||||
|
|
||||||
# Domain ID containing project (string value)
|
|
||||||
#project_domain_id = <None>
|
|
||||||
project_domain_id = {{ zun_service_project_domain_id }}
|
project_domain_id = {{ zun_service_project_domain_id }}
|
||||||
|
|
||||||
# Domain name containing project (string value)
|
|
||||||
#project_domain_name = <None>
|
|
||||||
|
|
||||||
# Project ID to scope to (string value)
|
|
||||||
# Deprecated group/name - [neutron]/tenant_id
|
|
||||||
#project_id = <None>
|
|
||||||
|
|
||||||
# Project name to scope to (string value)
|
|
||||||
# Deprecated group/name - [neutron]/tenant_name
|
|
||||||
#project_name = <None>
|
|
||||||
project_name = {{ zun_service_project_name }}
|
project_name = {{ zun_service_project_name }}
|
||||||
|
|
||||||
# Log requests to multiple loggers. (boolean value)
|
|
||||||
#split_loggers = false
|
|
||||||
|
|
||||||
# Scope for system operations (string value)
|
|
||||||
#system_scope = <None>
|
|
||||||
|
|
||||||
# Tenant ID (string value)
|
|
||||||
#tenant_id = <None>
|
|
||||||
|
|
||||||
# Tenant Name (string value)
|
|
||||||
#tenant_name = <None>
|
|
||||||
|
|
||||||
# Timeout value for http requests (integer value)
|
|
||||||
#timeout = <None>
|
|
||||||
|
|
||||||
# Token (string value)
|
|
||||||
#token = <None>
|
|
||||||
|
|
||||||
# Trust ID (string value)
|
|
||||||
#trust_id = <None>
|
|
||||||
|
|
||||||
# User's domain id (string value)
|
|
||||||
#user_domain_id = <None>
|
|
||||||
user_domain_id = {{ zun_service_user_domain_id }}
|
user_domain_id = {{ zun_service_user_domain_id }}
|
||||||
|
|
||||||
# User's domain name (string value)
|
|
||||||
#user_domain_name = <None>
|
|
||||||
|
|
||||||
# User id (string value)
|
|
||||||
#user_id = <None>
|
|
||||||
|
|
||||||
# Username (string value)
|
|
||||||
# Deprecated group/name - [neutron]/user_name
|
|
||||||
#username = <None>
|
|
||||||
username = {{ zun_kuryr_service_username }}
|
username = {{ zun_kuryr_service_username }}
|
||||||
|
|
||||||
# Whether a plugging operation is failed if the port to plug does not become
|
|
||||||
# active (boolean value)
|
|
||||||
vif_plugging_is_fatal = true
|
vif_plugging_is_fatal = true
|
||||||
|
|
||||||
# Seconds to wait for port to become active (integer value)
|
|
||||||
#vif_plugging_timeout = 0
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user