Merge "Change configuration to be consistent with underlines"

This commit is contained in:
Zuul 2019-07-01 19:27:06 +00:00 committed by Gerrit Code Review
commit 86fe66613b
13 changed files with 97 additions and 97 deletions

View File

@ -38,19 +38,19 @@ AGENT_OPTS = [
cfg.ListOpt('listen',
default=['0.0.0.0:%d' % DEFAULT_AGENT_PORT],
help='Agent host:port pairs to listen on'),
cfg.IntOpt('tcp-backlog', default=100,
cfg.IntOpt('tcp_backlog', default=100,
help='The Agent TCP Backlog'),
cfg.FloatOpt('tcp-recv-timeout', default=0.5,
cfg.FloatOpt('tcp_recv_timeout', default=0.5,
help='Agent TCP Receive Timeout'),
cfg.ListOpt('allow-notify', default=[],
cfg.ListOpt('allow_notify', default=[],
help='List of IP addresses allowed to NOTIFY The Agent'),
cfg.ListOpt('masters', default=[],
help='List of masters for the Agent, format ip:port'),
cfg.StrOpt('backend-driver', default='bind9',
cfg.StrOpt('backend_driver', default='bind9',
help='The backend driver to use, e.g. bind9, djbdns, knot2'),
cfg.StrOpt('transfer-source',
cfg.StrOpt('transfer_source',
help='An IP address to be used to fetch zones transferred in'),
cfg.FloatOpt('notify-delay', default=0.0,
cfg.FloatOpt('notify_delay', default=0.0,
help='Delay after a NOTIFY arrives for a zone that the Agent '
'will pause and drop subsequent NOTIFYs for that zone'),
]

View File

@ -25,9 +25,9 @@ API_OPTS = [
help='Number of api worker processes to spawn'),
cfg.IntOpt('threads', default=1000,
help='Number of api greenthreads to spawn'),
cfg.BoolOpt('enable-host-header', default=False,
cfg.BoolOpt('enable_host_header', default=False,
help='Enable host request headers'),
cfg.StrOpt('api-base-uri', default='http://127.0.0.1:9001/',
cfg.StrOpt('api_base_uri', default='http://127.0.0.1:9001/',
help='the url used as the base for all API responses,'
'This should consist of the scheme (http/https),'
'the hostname, port, and any paths that are added'
@ -49,9 +49,9 @@ API_OPTS = [
cfg.StrOpt('auth_strategy', default='keystone',
help='The strategy to use for auth. Supports noauth or '
'keystone'),
cfg.BoolOpt('enable-api-v2', default=True,
cfg.BoolOpt('enable_api_v2', default=True,
help='enable-api-v2 which enable in a future'),
cfg.BoolOpt('enable-api-admin', default=False,
cfg.BoolOpt('enable_api_admin', default=False,
help='enable-api-admin'),
cfg.IntOpt('max_header_line', default=16384,
help="Maximum line size of message headers to be accepted. "
@ -61,39 +61,39 @@ API_OPTS = [
]
APT_V2_OPTS = [
cfg.ListOpt('enabled-extensions-v2', default=[],
cfg.ListOpt('enabled_extensions_v2', default=[],
help='Enabled API Extensions for the V2 API'),
cfg.IntOpt('default-limit-v2', default=20,
cfg.IntOpt('default_limit_v2', default=20,
help='Default per-page limit for the V2 API, a value of None '
'means show all results by default'),
cfg.IntOpt('max-limit-v2', default=1000,
cfg.IntOpt('max_limit_v2', default=1000,
help='Max per-page limit for the V2 API'),
cfg.BoolOpt('quotas-verify-project-id', default=False,
cfg.BoolOpt('quotas_verify_project_id', default=False,
help='Verify that the requested Project ID for quota target '
'is a valid project in Keystone.'),
]
API_ADMIN_OPTS = [
cfg.ListOpt('enabled-extensions-admin', default=[],
cfg.ListOpt('enabled_extensions_admin', default=[],
help='Enabled Admin API Extensions'),
cfg.IntOpt('default-limit-admin', default=20,
cfg.IntOpt('default_limit_admin', default=20,
help='Default per-page limit for the Admin API, a value of None'
' means show all results by default'),
cfg.IntOpt('max-limit-admin', default=1000,
cfg.IntOpt('max_limit_admin', default=1000,
help='Max per-page limit for the Admin API'),
]
API_MIDDLEWARE_OPTS = [
cfg.BoolOpt('maintenance-mode', default=False,
cfg.BoolOpt('maintenance_mode', default=False,
help='Enable API Maintenance Mode'),
cfg.StrOpt('maintenance-mode-role', default='admin',
cfg.StrOpt('maintenance_mode_role', default='admin',
help='Role allowed to bypass maintaince mode'),
cfg.StrOpt('secure-proxy-ssl-header',
cfg.StrOpt('secure_proxy_ssl_header',
default='X-Forwarded-Proto',
help="The HTTP Header that will be used to determine which "
"the original request protocol scheme was, even if it was "
"removed by an SSL terminating proxy."),
cfg.StrOpt('override-proto',
cfg.StrOpt('override_proto',
help="A scheme that will be used to override "
"the request protocol scheme, even if it was "
"set by an SSL terminating proxy."),

View File

@ -29,7 +29,7 @@ DESIGNATE_OPTS = [
default=designate.BASE_PATH,
help='Directory where the designate python module is installed'
),
cfg.StrOpt('state-path', default='/var/lib/designate',
cfg.StrOpt('state_path', default='/var/lib/designate',
help='Top-level directory for maintaining designate\'s state'),
cfg.ListOpt(
@ -39,20 +39,20 @@ DESIGNATE_OPTS = [
deprecated_name='allowed_rpc_exception_modules'),
# Default TTL
cfg.IntOpt('default-ttl', default=3600, help='TTL Value'),
cfg.IntOpt('default_ttl', default=3600, help='TTL Value'),
# Default SOA Values
cfg.IntOpt('default-soa-refresh-min', default=3500,
deprecated_name='default-soa-refresh',
cfg.IntOpt('default_soa_refresh_min', default=3500,
deprecated_name='default_soa_refresh',
help='SOA refresh-min value'),
cfg.IntOpt('default-soa-refresh-max', default=3600,
cfg.IntOpt('default_soa_refresh_max', default=3600,
help='SOA max value'),
cfg.IntOpt('default-soa-retry', default=600, help='SOA retry'),
cfg.IntOpt('default-soa-expire', default=86400, help='SOA expire'),
cfg.IntOpt('default-soa-minimum', default=3600, help='SOA minimum value'),
cfg.IntOpt('default_soa_retry', default=600, help='SOA retry'),
cfg.IntOpt('default_soa_expire', default=86400, help='SOA expire'),
cfg.IntOpt('default_soa_minimum', default=3600, help='SOA minimum value'),
# Supported record types
cfg.ListOpt('supported-record-type', help='Supported record types',
cfg.ListOpt('supported_record_type', help='Supported record types',
default=['A', 'AAAA', 'CNAME', 'MX', 'SRV', 'TXT', 'SPF', 'NS',
'PTR', 'SSHFP', 'SOA', 'NAPTR', 'CAA']),
@ -66,7 +66,7 @@ DESIGNATE_OPTS = [
"server socket. Not supported on OS X."),
# Root Helper
cfg.StrOpt('root-helper',
cfg.StrOpt('root_helper',
default='sudo designate-rootwrap /etc/designate/rootwrap.conf',
help='designate-rootwrap configuration'),
@ -79,20 +79,20 @@ DESIGNATE_OPTS = [
# Notifications
cfg.BoolOpt('notify_api_faults', default=False,
help='Send notifications if there\'s a failure in the API.'),
cfg.StrOpt('notification-plugin', default='default',
cfg.StrOpt('notification_plugin', default='default',
help='The notification plugin to use'),
# Quota
cfg.StrOpt('quota-driver', default='storage', help='Quota driver to use'),
cfg.IntOpt('quota-zones', default=10,
cfg.StrOpt('quota_driver', default='storage', help='Quota driver to use'),
cfg.IntOpt('quota_zones', default=10,
help='Number of zones allowed per tenant'),
cfg.IntOpt('quota-zone-recordsets', default=500,
cfg.IntOpt('quota_zone_recordsets', default=500,
help='Number of recordsets allowed per zone'),
cfg.IntOpt('quota-zone-records', default=500,
cfg.IntOpt('quota_zone_records', default=500,
help='Number of records allowed per zone'),
cfg.IntOpt('quota-recordset-records', default=20,
cfg.IntOpt('quota_recordset_records', default=20,
help='Number of records allowed per recordset'),
cfg.IntOpt('quota-api-export-size', default=1000,
cfg.IntOpt('quota_api_export_size', default=1000,
help='Number of recordsets allowed in a zone export'),
]

View File

@ -21,14 +21,14 @@ BIND9_GROUP = cfg.OptGroup(
)
BINS9_OPTS = [
cfg.StrOpt('rndc-host', default='127.0.0.1', help='RNDC Host'),
cfg.IntOpt('rndc-port', default=953, help='RNDC Port'),
cfg.StrOpt('rndc-config-file',
cfg.StrOpt('rndc_host', default='127.0.0.1', help='RNDC Host'),
cfg.IntOpt('rndc_port', default=953, help='RNDC Port'),
cfg.StrOpt('rndc_config_file',
help='RNDC Config File'),
cfg.StrOpt('rndc-key-file', help='RNDC Key File'),
cfg.StrOpt('zone-file-path', default='$state_path/zones',
cfg.StrOpt('rndc_key_file', help='RNDC Key File'),
cfg.StrOpt('zone_file_path', default='$state_path/zones',
help='Path where zone files are stored'),
cfg.StrOpt('query-destination', default='127.0.0.1',
cfg.StrOpt('query_destination', default='127.0.0.1',
help='Host to query when finding zones'),
]

View File

@ -25,9 +25,9 @@ CENTRAL_OPTS = [
help='Number of central worker processes to spawn'),
cfg.IntOpt('threads', default=1000,
help='Number of central greenthreads to spawn'),
cfg.StrOpt('storage-driver', default='sqlalchemy',
cfg.StrOpt('storage_driver', default='sqlalchemy',
help='The storage driver to use'),
cfg.ListOpt('enabled-notification-handlers', default=[],
cfg.ListOpt('enabled_notification_handlers', default=[],
help='Enabled Notification Handlers'),
cfg.IntOpt('max_zone_name_len', default=255,
help="Maximum zone name length"),

View File

@ -22,26 +22,26 @@ DJBDNS_GROUP = cfg.OptGroup(
DJDNS_OPTS = [
cfg.StrOpt(
'tcpclient-cmd-name',
'tcpclient_cmd_name',
help='tcpclient executable path or rootwrap command name',
default='tcpclient'
),
cfg.StrOpt(
'axfr-get-cmd-name',
'axfr_get_cmd_name',
help='axfr-get executable path or rootwrap command name',
default='axfr-get'
),
cfg.StrOpt(
'tinydns-data-cmd-name',
'tinydns_data_cmd_name',
help='tinydns-data executable path or rootwrap command name',
default='tinydns-data'
),
cfg.StrOpt(
'tinydns-datadir',
'tinydns_datadir',
help='TinyDNS data directory',
default='/var/lib/djbdns'
),
cfg.StrOpt('query-destination', default='127.0.0.1',
cfg.StrOpt('query_destination', default='127.0.0.1',
help='Host to query when finding zones'),
]

View File

@ -20,13 +20,13 @@ GDNSD_GROUP = cfg.OptGroup(
title="Configuration for gdnsd backend"
)
GDNSD_OPTS = [
cfg.StrOpt('gdnsd-cmd-name',
cfg.StrOpt('gdnsd_cmd_name',
help='gdnsd executable path or rootwrap command name',
default='gdnsd'),
cfg.StrOpt('confdir-path',
cfg.StrOpt('confdir_path',
help='gdnsd configuration directory path',
default='/etc/gdnsd'),
cfg.StrOpt('query-destination', default='127.0.0.1',
cfg.StrOpt('query_destination', default='127.0.0.1',
help='Host to query when finding zones'),
]

View File

@ -21,10 +21,10 @@ KNOT2_GROUP = cfg.OptGroup(
)
KNOT2_OPTS = [
cfg.StrOpt('knotc-cmd-name',
cfg.StrOpt('knotc_cmd_name',
help='knotc executable path or rootwrap command name',
default='knotc'),
cfg.StrOpt('query-destination', default='127.0.0.1',
cfg.StrOpt('query_destination', default='127.0.0.1',
help='Host to query when finding zones'),
]

View File

@ -37,18 +37,18 @@ MDNS_OPTS = [
cfg.ListOpt('listen',
default=['0.0.0.0:%d' % DEFAULT_MDNS_PORT],
help='mDNS host:port pairs to listen on'),
cfg.IntOpt('tcp-backlog', default=100,
cfg.IntOpt('tcp_backlog', default=100,
help='mDNS TCP Backlog'),
cfg.FloatOpt('tcp-recv-timeout', default=0.5,
cfg.FloatOpt('tcp_recv_timeout', default=0.5,
help='mDNS TCP Receive Timeout'),
cfg.BoolOpt('all-tcp', default=False,
cfg.BoolOpt('all_tcp', default=False,
help='Send all traffic over TCP'),
cfg.BoolOpt('query-enforce-tsig', default=False,
cfg.BoolOpt('query_enforce_tsig', default=False,
help='Enforce all incoming queries (including AXFR) are TSIG '
'signed'),
cfg.StrOpt('storage-driver', default='sqlalchemy',
cfg.StrOpt('storage_driver', default='sqlalchemy',
help='The storage driver to use'),
cfg.IntOpt('max-message-size', default=65535,
cfg.IntOpt('max_message_size', default=65535,
help='Maximum message size to emit'),
cfg.StrOpt('topic', default='mdns',
help='RPC topic name for mdns'),

View File

@ -36,49 +36,49 @@ POOL_MANAGER_OPTS = [
help='Number of Pool Manager worker processes to spawn'),
cfg.IntOpt('threads', default=1000,
help='Number of Pool Manager greenthreads to spawn'),
cfg.StrOpt('pool-id', default='794ccc2c-d751-44fe-b57f-8894c9f5c842',
cfg.StrOpt('pool_id', default='794ccc2c-d751-44fe-b57f-8894c9f5c842',
help='The ID of the pool managed by this instance of the '
'Pool Manager'),
cfg.IntOpt('threshold-percentage', default=100,
cfg.IntOpt('threshold_percentage', default=100,
help='The percentage of servers requiring a successful update '
'for a zone change to be considered active',
deprecated_for_removal=True,
deprecated_reason='Migrated to designate-worker'),
cfg.IntOpt('poll-timeout', default=30,
cfg.IntOpt('poll_timeout', default=30,
help='The time to wait for a response from a server',
deprecated_for_removal=True,
deprecated_reason='Migrated to designate-worker'),
cfg.IntOpt('poll-retry-interval', default=15,
cfg.IntOpt('poll_retry_interval', default=15,
help='The time between retrying to send a request and '
'waiting for a response from a server',
deprecated_for_removal=True,
deprecated_reason='Migrated to designate-worker'),
cfg.IntOpt('poll-max-retries', default=10,
cfg.IntOpt('poll_max_retries', default=10,
help='The maximum number of times to retry sending a request '
'and wait for a response from a server',
deprecated_for_removal=True,
deprecated_reason='Migrated to designate-worker'),
cfg.IntOpt('poll-delay', default=5,
cfg.IntOpt('poll_delay', default=5,
help='The time to wait before sending the first request '
'to a server',
deprecated_for_removal=True,
deprecated_reason='Migrated to designate-worker'),
cfg.BoolOpt('enable-recovery-timer', default=True,
cfg.BoolOpt('enable_recovery_timer', default=True,
help='The flag for the recovery timer'),
cfg.IntOpt('periodic-recovery-interval', default=120,
cfg.IntOpt('periodic_recovery_interval', default=120,
help='The time between recovering from failures'),
cfg.BoolOpt('enable-sync-timer', default=True,
cfg.BoolOpt('enable_sync_timer', default=True,
help='The flag for the sync timer'),
cfg.IntOpt('periodic-sync-interval', default=1800,
cfg.IntOpt('periodic_sync_interval', default=1800,
help='The time between synchronizing the servers with storage'),
cfg.IntOpt('periodic-sync-seconds', default=21600,
cfg.IntOpt('periodic_sync_seconds', default=21600,
help='Zones Updated within last N seconds will be syncd.'
'Use an empty value to sync all zones.'),
cfg.IntOpt('periodic-sync-max-attempts', default=3,
cfg.IntOpt('periodic_sync_max_attempts', default=3,
help='Number of attempts to update a zone during sync'),
cfg.IntOpt('periodic-sync-retry-interval', default=30,
cfg.IntOpt('periodic_sync_retry_interval', default=30,
help='Interval between zone update attempts during sync'),
cfg.StrOpt('cache-driver', default='memcache',
cfg.StrOpt('cache_driver', default='memcache',
help='The cache driver to use'),
cfg.StrOpt('topic', default='pool_manager',
help='RPC topic name for pool-manager'),

View File

@ -57,9 +57,9 @@ PRODUCER_OPTS = [
help='Number of Producer greenthreads to spawn'),
cfg.ListOpt('enabled_tasks',
help='Enabled tasks to run'),
cfg.StrOpt('storage-driver', default='sqlalchemy',
cfg.StrOpt('storage_driver', default='sqlalchemy',
help='The storage driver to use'),
cfg.BoolOpt('export-synchronous', default=True,
cfg.BoolOpt('export_synchronous', default=True,
help='Whether to allow synchronous zone exports',
deprecated_for_removal=True,
deprecated_reason='Migrated to designate-worker'),
@ -80,11 +80,11 @@ ZONE_MANAGER_OPTS = [
help='Enabled tasks to run',
deprecated_for_removal=True,
deprecated_reason='Migrated to designate-worker'),
cfg.StrOpt('storage-driver', default='sqlalchemy',
cfg.StrOpt('storage_driver', default='sqlalchemy',
help='The storage driver to use',
deprecated_for_removal=True,
deprecated_reason='Migrated to designate-worker'),
cfg.BoolOpt('export-synchronous', default=True,
cfg.BoolOpt('export_synchronous', default=True,
help='Whether to allow synchronous zone exports',
deprecated_for_removal=True,
deprecated_reason='Migrated to designate-worker'),

View File

@ -40,9 +40,9 @@ SINK_OPTS = [
help='Number of sink worker processes to spawn'),
cfg.IntOpt('threads', default=1000,
help='Number of sink greenthreads to spawn'),
cfg.ListOpt('enabled-notification-handlers', default=[],
cfg.ListOpt('enabled_notification_handlers', default=[],
help='Enabled Notification Handlers'),
cfg.StrOpt('listener-pool-name',
cfg.StrOpt('listener_pool_name',
help='pool name to use for oslo.messaging '
'notification listener. '
'Note that listener pooling is not supported '
@ -50,20 +50,20 @@ SINK_OPTS = [
]
SINK_FAKE_OPTS = [
cfg.ListOpt('notification-topics', default=['notifications'],
cfg.ListOpt('notification_topics', default=['notifications'],
help='notification events for the fake notification handler'),
cfg.StrOpt('control-exchange', default='fake',
cfg.StrOpt('control_exchange', default='fake',
help='control-exchange for fake notifications'),
cfg.ListOpt('allowed-event-types', default=[],
cfg.ListOpt('allowed_event_types', default=[],
help='the event types we want the fake handler to accept'),
]
SINK_NEUTRON_OPTS = [
cfg.ListOpt('notification-topics', default=['notifications'],
cfg.ListOpt('notification_topics', default=['notifications'],
help='notification any events from neutron'),
cfg.StrOpt('control-exchange', default='neutron',
cfg.StrOpt('control_exchange', default='neutron',
help='control-exchange for neutron notification'),
cfg.StrOpt('zone-id', help='Zone ID with each notification'),
cfg.StrOpt('zone_id', help='Zone ID with each notification'),
cfg.MultiStrOpt('formatv4', help='IPv4 format'),
cfg.MultiStrOpt('format', deprecated_for_removal=True,
deprecated_reason="Replaced by 'formatv4/formatv6'",
@ -72,11 +72,11 @@ SINK_NEUTRON_OPTS = [
]
SINK_NOVA_OPTS = [
cfg.ListOpt('notification-topics', default=['notifications'],
cfg.ListOpt('notification_topics', default=['notifications'],
help='notification any events from nova'),
cfg.StrOpt('control-exchange', default='nova',
cfg.StrOpt('control_exchange', default='nova',
help='control-exchange for nova notification'),
cfg.StrOpt('zone-id', help='Zone ID with each notification'),
cfg.StrOpt('zone_id', help='Zone ID with each notification'),
cfg.MultiStrOpt('formatv4', help='IPv4 format'),
cfg.MultiStrOpt('format', deprecated_for_removal=True,
deprecated_reason="Replaced by 'formatv4/formatv6'",

View File

@ -32,26 +32,26 @@ WORKER_OPTS = [
help='Number of Worker threads to spawn per process'),
# cfg.ListOpt('enabled_tasks',
# help='Enabled tasks to run'),
cfg.StrOpt('storage-driver', default='sqlalchemy',
cfg.StrOpt('storage_driver', default='sqlalchemy',
help='The storage driver to use'),
cfg.IntOpt('threshold-percentage', default=100,
help='The percentage of servers requiring a successful update '
'for a domain change to be considered active'),
cfg.IntOpt('poll-timeout', default=30,
cfg.IntOpt('poll_timeout', default=30,
help='The time to wait for a response from a server'),
cfg.IntOpt('poll-retry-interval', default=15,
cfg.IntOpt('poll_retry_interval', default=15,
help='The time between retrying to send a request and '
'waiting for a response from a server'),
cfg.IntOpt('poll-max-retries', default=10,
cfg.IntOpt('poll_max_retries', default=10,
help='The maximum number of times to retry sending a request '
'and wait for a response from a server'),
cfg.IntOpt('poll-delay', default=5,
cfg.IntOpt('poll_delay', default=5,
help='The time to wait before sending the first request '
'to a server'),
cfg.BoolOpt('notify', default=True,
help='Whether to allow worker to send NOTIFYs, this will '
'noop NOTIFYs in mdns if true'),
cfg.BoolOpt('export-synchronous', default=True,
cfg.BoolOpt('export_synchronous', default=True,
help='Whether to allow synchronous zone exports'),
cfg.StrOpt('topic', default='worker',
help='RPC topic name for worker'),