openstack/openstack-helm
Code Issues Proposed changes

Merge "Neutron: add config overides for all standard plugins."

Browse Source
This commit is contained in:
Jenkins 2017-04-12 14:55:51 +00:00 committed by Gerrit Code Review
commit 8d355a2919
4 changed files with 226 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

160
neutron/templates/etc/plugins/_linuxbridge_agent.ini.tpl
View File

@ -1,3 +1,53 @@
# Copyright 2017 The Openstack-Helm Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
{{ include "neutron.conf.linuxbridge_agent_values_skeleton" .Values.conf.linuxbridge_agent | trunc 0 }}
{{ include "neutron.conf.linuxbridge_agent" .Values.conf.linuxbridge_agent }}
{{- define "neutron.conf.linuxbridge_agent_values_skeleton" -}}
{{- if not .default -}}{{- set . "default" dict -}}{{- end -}}
{{- if not .default.oslo -}}{{- set .default "oslo" dict -}}{{- end -}}
{{- if not .default.oslo.log -}}{{- set .default.oslo "log" dict -}}{{- end -}}
{{- if not .agent -}}{{- set . "agent" dict -}}{{- end -}}
{{- if not .agent.neutron -}}{{- set .agent "neutron" dict -}}{{- end -}}
{{- if not .agent.neutron.ml2 -}}{{- set .agent.neutron "ml2" dict -}}{{- end -}}
{{- if not .agent.neutron.ml2.linuxbridge -}}{{- set .agent.neutron.ml2 "linuxbridge" dict -}}{{- end -}}
{{- if not .agent.neutron.ml2.linuxbridge.agent -}}{{- set .agent.neutron.ml2.linuxbridge "agent" dict -}}{{- end -}}
{{- if not .linux_bridge -}}{{- set . "linux_bridge" dict -}}{{- end -}}
{{- if not .linux_bridge.neutron -}}{{- set .linux_bridge "neutron" dict -}}{{- end -}}
{{- if not .linux_bridge.neutron.ml2 -}}{{- set .linux_bridge.neutron "ml2" dict -}}{{- end -}}
{{- if not .linux_bridge.neutron.ml2.linuxbridge -}}{{- set .linux_bridge.neutron.ml2 "linuxbridge" dict -}}{{- end -}}
{{- if not .linux_bridge.neutron.ml2.linuxbridge.agent -}}{{- set .linux_bridge.neutron.ml2.linuxbridge "agent" dict -}}{{- end -}}
{{- if not .securitygroup -}}{{- set . "securitygroup" dict -}}{{- end -}}
{{- if not .securitygroup.neutron -}}{{- set .securitygroup "neutron" dict -}}{{- end -}}
{{- if not .securitygroup.neutron.ml2 -}}{{- set .securitygroup.neutron "ml2" dict -}}{{- end -}}
{{- if not .securitygroup.neutron.ml2.linuxbridge -}}{{- set .securitygroup.neutron.ml2 "linuxbridge" dict -}}{{- end -}}
{{- if not .securitygroup.neutron.ml2.linuxbridge.agent -}}{{- set .securitygroup.neutron.ml2.linuxbridge "agent" dict -}}{{- end -}}
{{- if not .vxlan -}}{{- set . "vxlan" dict -}}{{- end -}}
{{- if not .vxlan.neutron -}}{{- set .vxlan "neutron" dict -}}{{- end -}}
{{- if not .vxlan.neutron.ml2 -}}{{- set .vxlan.neutron "ml2" dict -}}{{- end -}}
{{- if not .vxlan.neutron.ml2.linuxbridge -}}{{- set .vxlan.neutron.ml2 "linuxbridge" dict -}}{{- end -}}
{{- if not .vxlan.neutron.ml2.linuxbridge.agent -}}{{- set .vxlan.neutron.ml2.linuxbridge "agent" dict -}}{{- end -}}
{{- end -}}
{{- define "neutron.conf.linuxbridge_agent" -}}
[DEFAULT]
#
@ -7,13 +57,15 @@
# 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
# from .default.oslo.log.debug
{{ if not .default.oslo.log.debug }}#{{ end }}debug = {{ .default.oslo.log.debug | default "false" }}
# DEPRECATED: If set to false, the logging level will be set to WARNING instead
# of the default INFO level. (boolean value)
# This option is deprecated for removal.
# Its value may be silently ignored in the future.
#verbose = true
# from .default.oslo.log.verbose
{{ if not .default.oslo.log.verbose }}#{{ end }}verbose = {{ .default.oslo.log.verbose | default "true" }}
# The name of a logging configuration file. This file is appended to any
# existing logging configuration files. For details about logging configuration
@ -23,79 +75,97 @@
# 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>
# from .default.oslo.log.log_config_append
{{ if not .default.oslo.log.log_config_append }}#{{ end }}log_config_append = {{ .default.oslo.log.log_config_append | default "<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
# from .default.oslo.log.log_date_format
{{ if not .default.oslo.log.log_date_format }}#{{ end }}log_date_format = {{ .default.oslo.log.log_date_format | default "%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>
# from .default.oslo.log.log_file
{{ if not .default.oslo.log.log_file }}#{{ end }}log_file = {{ .default.oslo.log.log_file | default "<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>
# from .default.oslo.log.log_dir
{{ if not .default.oslo.log.log_dir }}#{{ end }}log_dir = {{ .default.oslo.log.log_dir | default "<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
# from .default.oslo.log.watch_log_file
{{ if not .default.oslo.log.watch_log_file }}#{{ end }}watch_log_file = {{ .default.oslo.log.watch_log_file | default "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
# from .default.oslo.log.use_syslog
{{ if not .default.oslo.log.use_syslog }}#{{ end }}use_syslog = {{ .default.oslo.log.use_syslog | default "false" }}
# Syslog facility to receive log lines. This option is ignored if
# log_config_append is set. (string value)
#syslog_log_facility = LOG_USER
# from .default.oslo.log.syslog_log_facility
{{ if not .default.oslo.log.syslog_log_facility }}#{{ end }}syslog_log_facility = {{ .default.oslo.log.syslog_log_facility | default "LOG_USER" }}
# Log output to standard error. This option is ignored if log_config_append is
# set. (boolean value)
#use_stderr = true
# from .default.oslo.log.use_stderr
{{ if not .default.oslo.log.use_stderr }}#{{ end }}use_stderr = {{ .default.oslo.log.use_stderr | default "true" }}
# Format string to use for log messages with context. (string value)
#logging_context_format_string = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s
# from .default.oslo.log.logging_context_format_string
{{ if not .default.oslo.log.logging_context_format_string }}#{{ end }}logging_context_format_string = {{ .default.oslo.log.logging_context_format_string | default "%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s" }}
# Format string to use for log messages when context is undefined. (string
# value)
#logging_default_format_string = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s
# from .default.oslo.log.logging_default_format_string
{{ if not .default.oslo.log.logging_default_format_string }}#{{ end }}logging_default_format_string = {{ .default.oslo.log.logging_default_format_string | default "%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s" }}
# Additional data to append to log message when logging level for the message
# is DEBUG. (string value)
#logging_debug_format_suffix = %(funcName)s %(pathname)s:%(lineno)d
# from .default.oslo.log.logging_debug_format_suffix
{{ if not .default.oslo.log.logging_debug_format_suffix }}#{{ end }}logging_debug_format_suffix = {{ .default.oslo.log.logging_debug_format_suffix | default "%(funcName)s %(pathname)s:%(lineno)d" }}
# Prefix each line of exception output with this format. (string value)
#logging_exception_prefix = %(asctime)s.%(msecs)03d %(process)d ERROR %(name)s %(instance)s
# from .default.oslo.log.logging_exception_prefix
{{ if not .default.oslo.log.logging_exception_prefix }}#{{ end }}logging_exception_prefix = {{ .default.oslo.log.logging_exception_prefix | default "%(asctime)s.%(msecs)03d %(process)d ERROR %(name)s %(instance)s" }}
# Defines the format string for %(user_identity)s that is used in
# logging_context_format_string. (string value)
#logging_user_identity_format = %(user)s %(tenant)s %(domain)s %(user_domain)s %(project_domain)s
# from .default.oslo.log.logging_user_identity_format
{{ if not .default.oslo.log.logging_user_identity_format }}#{{ end }}logging_user_identity_format = {{ .default.oslo.log.logging_user_identity_format | default "%(user)s %(tenant)s %(domain)s %(user_domain)s %(project_domain)s" }}
# List of package logging levels in logger=LEVEL pairs. This option is ignored
# if log_config_append is set. (list value)
#default_log_levels = amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,oslo.messaging=INFO,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN,urllib3.connectionpool=WARN,websocket=WARN,requests.packages.urllib3.util.retry=WARN,urllib3.util.retry=WARN,keystonemiddleware=WARN,routes.middleware=WARN,stevedore=WARN,taskflow=WARN,keystoneauth=WARN,oslo.cache=INFO,dogpile.core.dogpile=INFO
# from .default.oslo.log.default_log_levels
{{ if not .default.oslo.log.default_log_levels }}#{{ end }}default_log_levels = {{ .default.oslo.log.default_log_levels | default "amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,oslo.messaging=INFO,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN,urllib3.connectionpool=WARN,websocket=WARN,requests.packages.urllib3.util.retry=WARN,urllib3.util.retry=WARN,keystonemiddleware=WARN,routes.middleware=WARN,stevedore=WARN,taskflow=WARN,keystoneauth=WARN,oslo.cache=INFO,dogpile.core.dogpile=INFO" }}
# Enables or disables publication of error events. (boolean value)
#publish_errors = false
# from .default.oslo.log.publish_errors
{{ if not .default.oslo.log.publish_errors }}#{{ end }}publish_errors = {{ .default.oslo.log.publish_errors | default "false" }}
# The format for an instance that is passed with the log message. (string
# value)
#instance_format = "[instance: %(uuid)s] "
# from .default.oslo.log.instance_format
{{ if not .default.oslo.log.instance_format }}#{{ end }}instance_format = {{ .default.oslo.log.instance_format | default "\"[instance: %(uuid)s] \"" }}
# The format for an instance UUID that is passed with the log message. (string
# value)
#instance_uuid_format = "[instance: %(uuid)s] "
# from .default.oslo.log.instance_uuid_format
{{ if not .default.oslo.log.instance_uuid_format }}#{{ end }}instance_uuid_format = {{ .default.oslo.log.instance_uuid_format | default "\"[instance: %(uuid)s] \"" }}
# Enables or disables fatal status of deprecations. (boolean value)
#fatal_deprecations = false
# from .default.oslo.log.fatal_deprecations
{{ if not .default.oslo.log.fatal_deprecations }}#{{ end }}fatal_deprecations = {{ .default.oslo.log.fatal_deprecations | default "false" }}
[agent]
@ -106,11 +176,13 @@
# The number of seconds the agent will wait between polling for local device
# changes. (integer value)
#polling_interval = 2
# from .agent.neutron.ml2.linuxbridge.agent.polling_interval
{{ if not .agent.neutron.ml2.linuxbridge.agent.polling_interval }}#{{ end }}polling_interval = {{ .agent.neutron.ml2.linuxbridge.agent.polling_interval | default "2" }}
# Set new timeout in seconds for new rpc calls after agent receives SIGTERM. If
# value is set to 0, rpc timeout won't be changed (integer value)
#quitting_rpc_timeout = 10
# from .agent.neutron.ml2.linuxbridge.agent.quitting_rpc_timeout
{{ if not .agent.neutron.ml2.linuxbridge.agent.quitting_rpc_timeout }}#{{ end }}quitting_rpc_timeout = {{ .agent.neutron.ml2.linuxbridge.agent.quitting_rpc_timeout | default "10" }}
# DEPRECATED: Enable suppression of ARP responses that don't match an IP
# address that belongs to the port from which they originate. Note: This
@ -123,10 +195,12 @@
# protection will be via the port security extension. (boolean value)
# This option is deprecated for removal.
# Its value may be silently ignored in the future.
#prevent_arp_spoofing = true
# from .agent.neutron.ml2.linuxbridge.agent.prevent_arp_spoofing
{{ if not .agent.neutron.ml2.linuxbridge.agent.prevent_arp_spoofing }}#{{ end }}prevent_arp_spoofing = {{ .agent.neutron.ml2.linuxbridge.agent.prevent_arp_spoofing | default "true" }}
# Extensions list to use (list value)
#extensions =
# from .agent.neutron.ml2.linuxbridge.agent.extensions
{{ if not .agent.neutron.ml2.linuxbridge.agent.extensions }}#{{ end }}extensions = {{ .agent.neutron.ml2.linuxbridge.agent.extensions | default "" }}
[linux_bridge]
@ -140,10 +214,12 @@
# interfaces to be used for flat and VLAN networks. All physical networks
# listed in network_vlan_ranges on the server should have mappings to
# appropriate interfaces on each agent. (list value)
#physical_interface_mappings =
# from .linux_bridge.neutron.ml2.linuxbridge.agent.physical_interface_mappings
{{ if not .linux_bridge.neutron.ml2.linuxbridge.agent.physical_interface_mappings }}#{{ end }}physical_interface_mappings = {{ .linux_bridge.neutron.ml2.linuxbridge.agent.physical_interface_mappings | default "" }}
# List of <physical_network>:<physical_bridge> (list value)
#bridge_mappings =
# from .linux_bridge.neutron.ml2.linuxbridge.agent.bridge_mappings
{{ if not .linux_bridge.neutron.ml2.linuxbridge.agent.bridge_mappings }}#{{ end }}bridge_mappings = {{ .linux_bridge.neutron.ml2.linuxbridge.agent.bridge_mappings | default "" }}
[securitygroup]
@ -153,16 +229,19 @@
#
# Driver for security groups firewall in the L2 agent (string value)
#firewall_driver = <None>
# from .securitygroup.neutron.ml2.linuxbridge.agent.firewall_driver
{{ if not .securitygroup.neutron.ml2.linuxbridge.agent.firewall_driver }}#{{ end }}firewall_driver = {{ .securitygroup.neutron.ml2.linuxbridge.agent.firewall_driver | default "<None>" }}
# Controls whether the neutron security group API is enabled in the server. It
# should be false when using no security groups or using the nova security
# group API. (boolean value)
#enable_security_group = true
# from .securitygroup.neutron.ml2.linuxbridge.agent.enable_security_group
{{ if not .securitygroup.neutron.ml2.linuxbridge.agent.enable_security_group }}#{{ end }}enable_security_group = {{ .securitygroup.neutron.ml2.linuxbridge.agent.enable_security_group | default "true" }}
# Use ipset to speed-up the iptables based security groups. Enabling ipset
# support requires that ipset is installed on L2 agent node. (boolean value)
#enable_ipset = true
# from .securitygroup.neutron.ml2.linuxbridge.agent.enable_ipset
{{ if not .securitygroup.neutron.ml2.linuxbridge.agent.enable_ipset }}#{{ end }}enable_ipset = {{ .securitygroup.neutron.ml2.linuxbridge.agent.enable_ipset | default "true" }}
[vxlan]
@ -173,13 +252,16 @@
# Enable VXLAN on the agent. Can be enabled when agent is managed by ml2 plugin
# using linuxbridge mechanism driver (boolean value)
#enable_vxlan = true
# from .vxlan.neutron.ml2.linuxbridge.agent.enable_vxlan
{{ if not .vxlan.neutron.ml2.linuxbridge.agent.enable_vxlan }}#{{ end }}enable_vxlan = {{ .vxlan.neutron.ml2.linuxbridge.agent.enable_vxlan | default "true" }}
# TTL for vxlan interface protocol packets. (integer value)
#ttl = <None>
# from .vxlan.neutron.ml2.linuxbridge.agent.ttl
{{ if not .vxlan.neutron.ml2.linuxbridge.agent.ttl }}#{{ end }}ttl = {{ .vxlan.neutron.ml2.linuxbridge.agent.ttl | default "<None>" }}
# TOS for vxlan interface protocol packets. (integer value)
#tos = <None>
# from .vxlan.neutron.ml2.linuxbridge.agent.tos
{{ if not .vxlan.neutron.ml2.linuxbridge.agent.tos }}#{{ end }}tos = {{ .vxlan.neutron.ml2.linuxbridge.agent.tos | default "<None>" }}
# Multicast group(s) for vxlan interface. A range of group addresses may be
# specified by using CIDR notation. Specifying a range allows different VNIs to
@ -187,21 +269,27 @@
# traffic to the tunnel endpoints. To reserve a unique group for each possible
# (24-bit) VNI, use a /8 such as 239.0.0.0/8. This setting must be the same on
# all the agents. (string value)
#vxlan_group = 224.0.0.1
# from .vxlan.neutron.ml2.linuxbridge.agent.vxlan_group
{{ if not .vxlan.neutron.ml2.linuxbridge.agent.vxlan_group }}#{{ end }}vxlan_group = {{ .vxlan.neutron.ml2.linuxbridge.agent.vxlan_group | default "224.0.0.1" }}
# IP address of local overlay (tunnel) network endpoint. Use either an IPv4 or
# IPv6 address that resides on one of the host network interfaces. The IP
# version of this value must match the value of the 'overlay_ip_version' option
# in the ML2 plug-in configuration file on the neutron server node(s). (IP
# address value)
#local_ip = <None>
# from .vxlan.neutron.ml2.linuxbridge.agent.local_ip
{{ if not .vxlan.neutron.ml2.linuxbridge.agent.local_ip }}#{{ end }}local_ip = {{ .vxlan.neutron.ml2.linuxbridge.agent.local_ip | default "<None>" }}
# Extension to use alongside ml2 plugin's l2population mechanism driver. It
# enables the plugin to populate VXLAN forwarding table. (boolean value)
#l2_population = false
# from .vxlan.neutron.ml2.linuxbridge.agent.l2_population
{{ if not .vxlan.neutron.ml2.linuxbridge.agent.l2_population }}#{{ end }}l2_population = {{ .vxlan.neutron.ml2.linuxbridge.agent.l2_population | default "false" }}
# Enable local ARP responder which provides local responses instead of
# performing ARP broadcast into the overlay. Enabling local ARP responder is
# not fully compatible with the allowed-address-pairs extension. (boolean
# value)
#arp_responder = false
# from .vxlan.neutron.ml2.linuxbridge.agent.arp_responder
{{ if not .vxlan.neutron.ml2.linuxbridge.agent.arp_responder }}#{{ end }}arp_responder = {{ .vxlan.neutron.ml2.linuxbridge.agent.arp_responder | default "false" }}
{{- end -}}

128
neutron/templates/etc/plugins/_macvtap_agent.ini.tpl
View File

@ -1,3 +1,48 @@
# Copyright 2017 The Openstack-Helm Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
{{ include "neutron.conf.macvtap_agent_values_skeleton" .Values.conf.macvtap_agent | trunc 0 }}
{{ include "neutron.conf.macvtap_agent" .Values.conf.macvtap_agent }}
{{- define "neutron.conf.macvtap_agent_values_skeleton" -}}
{{- if not .default -}}{{- set . "default" dict -}}{{- end -}}
{{- if not .default.oslo -}}{{- set .default "oslo" dict -}}{{- end -}}
{{- if not .default.oslo.log -}}{{- set .default.oslo "log" dict -}}{{- end -}}
{{- if not .agent -}}{{- set . "agent" dict -}}{{- end -}}
{{- if not .agent.neutron -}}{{- set .agent "neutron" dict -}}{{- end -}}
{{- if not .agent.neutron.ml2 -}}{{- set .agent.neutron "ml2" dict -}}{{- end -}}
{{- if not .agent.neutron.ml2.macvtap -}}{{- set .agent.neutron.ml2 "macvtap" dict -}}{{- end -}}
{{- if not .agent.neutron.ml2.macvtap.agent -}}{{- set .agent.neutron.ml2.macvtap "agent" dict -}}{{- end -}}
{{- if not .macvtap -}}{{- set . "macvtap" dict -}}{{- end -}}
{{- if not .macvtap.neutron -}}{{- set .macvtap "neutron" dict -}}{{- end -}}
{{- if not .macvtap.neutron.ml2 -}}{{- set .macvtap.neutron "ml2" dict -}}{{- end -}}
{{- if not .macvtap.neutron.ml2.macvtap -}}{{- set .macvtap.neutron.ml2 "macvtap" dict -}}{{- end -}}
{{- if not .macvtap.neutron.ml2.macvtap.agent -}}{{- set .macvtap.neutron.ml2.macvtap "agent" dict -}}{{- end -}}
{{- if not .securitygroup -}}{{- set . "securitygroup" dict -}}{{- end -}}
{{- if not .securitygroup.neutron -}}{{- set .securitygroup "neutron" dict -}}{{- end -}}
{{- if not .securitygroup.neutron.ml2 -}}{{- set .securitygroup.neutron "ml2" dict -}}{{- end -}}
{{- if not .securitygroup.neutron.ml2.macvtap -}}{{- set .securitygroup.neutron.ml2 "macvtap" dict -}}{{- end -}}
{{- if not .securitygroup.neutron.ml2.macvtap.agent -}}{{- set .securitygroup.neutron.ml2.macvtap "agent" dict -}}{{- end -}}
{{- end -}}
{{- define "neutron.conf.macvtap_agent" -}}
[DEFAULT]
#
@ -7,13 +52,15 @@
# 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
# from .default.oslo.log.debug
{{ if not .default.oslo.log.debug }}#{{ end }}debug = {{ .default.oslo.log.debug | default "false" }}
# DEPRECATED: If set to false, the logging level will be set to WARNING instead
# of the default INFO level. (boolean value)
# This option is deprecated for removal.
# Its value may be silently ignored in the future.
#verbose = true
# from .default.oslo.log.verbose
{{ if not .default.oslo.log.verbose }}#{{ end }}verbose = {{ .default.oslo.log.verbose | default "true" }}
# The name of a logging configuration file. This file is appended to any
# existing logging configuration files. For details about logging configuration
@ -23,79 +70,97 @@
# 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>
# from .default.oslo.log.log_config_append
{{ if not .default.oslo.log.log_config_append }}#{{ end }}log_config_append = {{ .default.oslo.log.log_config_append | default "<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
# from .default.oslo.log.log_date_format
{{ if not .default.oslo.log.log_date_format }}#{{ end }}log_date_format = {{ .default.oslo.log.log_date_format | default "%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>
# from .default.oslo.log.log_file
{{ if not .default.oslo.log.log_file }}#{{ end }}log_file = {{ .default.oslo.log.log_file | default "<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>
# from .default.oslo.log.log_dir
{{ if not .default.oslo.log.log_dir }}#{{ end }}log_dir = {{ .default.oslo.log.log_dir | default "<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
# from .default.oslo.log.watch_log_file
{{ if not .default.oslo.log.watch_log_file }}#{{ end }}watch_log_file = {{ .default.oslo.log.watch_log_file | default "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
# from .default.oslo.log.use_syslog
{{ if not .default.oslo.log.use_syslog }}#{{ end }}use_syslog = {{ .default.oslo.log.use_syslog | default "false" }}
# Syslog facility to receive log lines. This option is ignored if
# log_config_append is set. (string value)
#syslog_log_facility = LOG_USER
# from .default.oslo.log.syslog_log_facility
{{ if not .default.oslo.log.syslog_log_facility }}#{{ end }}syslog_log_facility = {{ .default.oslo.log.syslog_log_facility | default "LOG_USER" }}
# Log output to standard error. This option is ignored if log_config_append is
# set. (boolean value)
#use_stderr = true
# from .default.oslo.log.use_stderr
{{ if not .default.oslo.log.use_stderr }}#{{ end }}use_stderr = {{ .default.oslo.log.use_stderr | default "true" }}
# Format string to use for log messages with context. (string value)
#logging_context_format_string = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s
# from .default.oslo.log.logging_context_format_string
{{ if not .default.oslo.log.logging_context_format_string }}#{{ end }}logging_context_format_string = {{ .default.oslo.log.logging_context_format_string | default "%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s" }}
# Format string to use for log messages when context is undefined. (string
# value)
#logging_default_format_string = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s
# from .default.oslo.log.logging_default_format_string
{{ if not .default.oslo.log.logging_default_format_string }}#{{ end }}logging_default_format_string = {{ .default.oslo.log.logging_default_format_string | default "%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s" }}
# Additional data to append to log message when logging level for the message
# is DEBUG. (string value)
#logging_debug_format_suffix = %(funcName)s %(pathname)s:%(lineno)d
# from .default.oslo.log.logging_debug_format_suffix
{{ if not .default.oslo.log.logging_debug_format_suffix }}#{{ end }}logging_debug_format_suffix = {{ .default.oslo.log.logging_debug_format_suffix | default "%(funcName)s %(pathname)s:%(lineno)d" }}
# Prefix each line of exception output with this format. (string value)
#logging_exception_prefix = %(asctime)s.%(msecs)03d %(process)d ERROR %(name)s %(instance)s
# from .default.oslo.log.logging_exception_prefix
{{ if not .default.oslo.log.logging_exception_prefix }}#{{ end }}logging_exception_prefix = {{ .default.oslo.log.logging_exception_prefix | default "%(asctime)s.%(msecs)03d %(process)d ERROR %(name)s %(instance)s" }}
# Defines the format string for %(user_identity)s that is used in
# logging_context_format_string. (string value)
#logging_user_identity_format = %(user)s %(tenant)s %(domain)s %(user_domain)s %(project_domain)s
# from .default.oslo.log.logging_user_identity_format
{{ if not .default.oslo.log.logging_user_identity_format }}#{{ end }}logging_user_identity_format = {{ .default.oslo.log.logging_user_identity_format | default "%(user)s %(tenant)s %(domain)s %(user_domain)s %(project_domain)s" }}
# List of package logging levels in logger=LEVEL pairs. This option is ignored
# if log_config_append is set. (list value)
#default_log_levels = amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,oslo.messaging=INFO,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN,urllib3.connectionpool=WARN,websocket=WARN,requests.packages.urllib3.util.retry=WARN,urllib3.util.retry=WARN,keystonemiddleware=WARN,routes.middleware=WARN,stevedore=WARN,taskflow=WARN,keystoneauth=WARN,oslo.cache=INFO,dogpile.core.dogpile=INFO
# from .default.oslo.log.default_log_levels
{{ if not .default.oslo.log.default_log_levels }}#{{ end }}default_log_levels = {{ .default.oslo.log.default_log_levels | default "amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,oslo.messaging=INFO,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN,urllib3.connectionpool=WARN,websocket=WARN,requests.packages.urllib3.util.retry=WARN,urllib3.util.retry=WARN,keystonemiddleware=WARN,routes.middleware=WARN,stevedore=WARN,taskflow=WARN,keystoneauth=WARN,oslo.cache=INFO,dogpile.core.dogpile=INFO" }}
# Enables or disables publication of error events. (boolean value)
#publish_errors = false
# from .default.oslo.log.publish_errors
{{ if not .default.oslo.log.publish_errors }}#{{ end }}publish_errors = {{ .default.oslo.log.publish_errors | default "false" }}
# The format for an instance that is passed with the log message. (string
# value)
#instance_format = "[instance: %(uuid)s] "
# from .default.oslo.log.instance_format
{{ if not .default.oslo.log.instance_format }}#{{ end }}instance_format = {{ .default.oslo.log.instance_format | default "\"[instance: %(uuid)s] \"" }}
# The format for an instance UUID that is passed with the log message. (string
# value)
#instance_uuid_format = "[instance: %(uuid)s] "
# from .default.oslo.log.instance_uuid_format
{{ if not .default.oslo.log.instance_uuid_format }}#{{ end }}instance_uuid_format = {{ .default.oslo.log.instance_uuid_format | default "\"[instance: %(uuid)s] \"" }}
# Enables or disables fatal status of deprecations. (boolean value)
#fatal_deprecations = false
# from .default.oslo.log.fatal_deprecations
{{ if not .default.oslo.log.fatal_deprecations }}#{{ end }}fatal_deprecations = {{ .default.oslo.log.fatal_deprecations | default "false" }}
[agent]
@ -106,11 +171,13 @@
# The number of seconds the agent will wait between polling for local device
# changes. (integer value)
#polling_interval = 2
# from .agent.neutron.ml2.macvtap.agent.polling_interval
{{ if not .agent.neutron.ml2.macvtap.agent.polling_interval }}#{{ end }}polling_interval = {{ .agent.neutron.ml2.macvtap.agent.polling_interval | default "2" }}
# Set new timeout in seconds for new rpc calls after agent receives SIGTERM. If
# value is set to 0, rpc timeout won't be changed (integer value)
#quitting_rpc_timeout = 10
# from .agent.neutron.ml2.macvtap.agent.quitting_rpc_timeout
{{ if not .agent.neutron.ml2.macvtap.agent.quitting_rpc_timeout }}#{{ end }}quitting_rpc_timeout = {{ .agent.neutron.ml2.macvtap.agent.quitting_rpc_timeout | default "10" }}
# DEPRECATED: Enable suppression of ARP responses that don't match an IP
# address that belongs to the port from which they originate. Note: This
@ -123,7 +190,8 @@
# protection will be via the port security extension. (boolean value)
# This option is deprecated for removal.
# Its value may be silently ignored in the future.
#prevent_arp_spoofing = true
# from .agent.neutron.ml2.macvtap.agent.prevent_arp_spoofing
{{ if not .agent.neutron.ml2.macvtap.agent.prevent_arp_spoofing }}#{{ end }}prevent_arp_spoofing = {{ .agent.neutron.ml2.macvtap.agent.prevent_arp_spoofing | default "true" }}
[macvtap]
@ -137,7 +205,8 @@
# interfaces to be used for flat and VLAN networks. All physical networks
# listed in network_vlan_ranges on the server should have mappings to
# appropriate interfaces on each agent. (list value)
#physical_interface_mappings =
# from .macvtap.neutron.ml2.macvtap.agent.physical_interface_mappings
{{ if not .macvtap.neutron.ml2.macvtap.agent.physical_interface_mappings }}#{{ end }}physical_interface_mappings = {{ .macvtap.neutron.ml2.macvtap.agent.physical_interface_mappings | default "" }}
[securitygroup]
@ -147,13 +216,18 @@
#
# Driver for security groups firewall in the L2 agent (string value)
#firewall_driver = <None>
# from .securitygroup.neutron.ml2.macvtap.agent.firewall_driver
{{ if not .securitygroup.neutron.ml2.macvtap.agent.firewall_driver }}#{{ end }}firewall_driver = {{ .securitygroup.neutron.ml2.macvtap.agent.firewall_driver | default "<None>" }}
# Controls whether the neutron security group API is enabled in the server. It
# should be false when using no security groups or using the nova security
# group API. (boolean value)
#enable_security_group = true
# from .securitygroup.neutron.ml2.macvtap.agent.enable_security_group
{{ if not .securitygroup.neutron.ml2.macvtap.agent.enable_security_group }}#{{ end }}enable_security_group = {{ .securitygroup.neutron.ml2.macvtap.agent.enable_security_group | default "true" }}
# Use ipset to speed-up the iptables based security groups. Enabling ipset
# support requires that ipset is installed on L2 agent node. (boolean value)
#enable_ipset = true
# from .securitygroup.neutron.ml2.macvtap.agent.enable_ipset
{{ if not .securitygroup.neutron.ml2.macvtap.agent.enable_ipset }}#{{ end }}enable_ipset = {{ .securitygroup.neutron.ml2.macvtap.agent.enable_ipset | default "true" }}
{{- end -}}

1
neutron/templates/etc/plugins/_ml2_conf.ini.tpl
View File

@ -325,4 +325,3 @@
{{ if not .securitygroup.neutron.ml2.enable_ipset }}#{{ end }}enable_ipset = {{ .securitygroup.neutron.ml2.enable_ipset | default "true" }}
{{- end -}}

2
neutron/templates/etc/plugins/_sriov_agent.ini.tpl
View File

@ -18,6 +18,7 @@
{{- define "neutron.conf.sriov_agent_values_skeleton" -}}
{{- if not .default -}}{{- set . "default" dict -}}{{- end -}}
{{- if not .default.oslo -}}{{- set .default "oslo" dict -}}{{- end -}}
{{- if not .default.oslo.log -}}{{- set .default.oslo "log" dict -}}{{- end -}}
@ -26,7 +27,6 @@
{{- if not .agent.neutron.ml2 -}}{{- set .agent.neutron "ml2" dict -}}{{- end -}}
{{- if not .agent.neutron.ml2.sriov -}}{{- set .agent.neutron.ml2 "sriov" dict -}}{{- end -}}
{{- if not .agent.neutron.ml2.sriov.agent -}}{{- set .agent.neutron.ml2.sriov "agent" dict -}}{{- end -}}
{{- if not .agent.neutron.ml2.agent -}}{{- set .agent.neutron.ml2 "agent" dict -}}{{- end -}}
{{- if not .sriov_nic -}}{{- set . "sriov_nic" dict -}}{{- end -}}
{{- if not .sriov_nic.neutron -}}{{- set .sriov_nic "neutron" dict -}}{{- end -}}
{{- if not .sriov_nic.neutron.ml2 -}}{{- set .sriov_nic.neutron "ml2" dict -}}{{- end -}}