From 33a5245874a8fa1af9864760321ed59b952e99e4 Mon Sep 17 00:00:00 2001 From: Jens Harbott Date: Thu, 7 Dec 2017 08:50:40 +0000 Subject: [PATCH] Remove partial sample config Instead of having a partial sample config that may be outdated, have users reference the config file the can be generated from source by running "tox -e genconfig". Also change the name of the generated config so that it is covered by our .gitignore and matches the README. Change-Id: I49afb68a170abffaf7852dd7a2dc837e4cf4a756 --- etc/designate/designate-config-generator.conf | 4 +- etc/designate/designate.conf.sample | 581 ------------------ 2 files changed, 2 insertions(+), 583 deletions(-) delete mode 100644 etc/designate/designate.conf.sample diff --git a/etc/designate/designate-config-generator.conf b/etc/designate/designate-config-generator.conf index bce0e17a4..9539f8e28 100644 --- a/etc/designate/designate-config-generator.conf +++ b/etc/designate/designate-config-generator.conf @@ -1,5 +1,5 @@ [DEFAULT] -output_file = etc/designate/designate_full.conf.sample +output_file = etc/designate/designate.conf wrap_width = 80 @@ -23,4 +23,4 @@ namespace = oslo.service.sslutils namespace = oslo.db namespace = oslo.middleware namespace = oslo.concurrency -namespace = keystonemiddleware.auth_token \ No newline at end of file +namespace = keystonemiddleware.auth_token diff --git a/etc/designate/designate.conf.sample b/etc/designate/designate.conf.sample deleted file mode 100644 index b4feed2ab..000000000 --- a/etc/designate/designate.conf.sample +++ /dev/null @@ -1,581 +0,0 @@ -[DEFAULT] -# Where an option is commented out, but filled in this shows the default -# value of that option - -######################## -## General Configuration -######################## -# Show more verbose log output (sets INFO log level output) -verbose = True - -# Show debugging output in logs (sets DEBUG log level output) -debug = False - -# Top-level directory for maintaining designate's state -#state_path = /var/lib/designate - -# Log Configuration -#log_config = None - -# Log directory -#logdir = /var/log/designate - -# Driver used for issuing notifications -#notification_driver = messaging - -# Notification Topics -#notification_topics = notifications - -# Use "sudo designate-rootwrap /etc/designate/rootwrap.conf" to use the real -# root filter facility. -# Change to "sudo" to skip the filtering and just run the command directly -#root_helper = sudo designate-rootwrap /etc/designate/rootwrap.conf - -# Which networking API to use, Defaults to neutron -#network_api = neutron - -# Supported record types -#supported_record_type = A, AAAA, CNAME, MX, SRV, TXT, SPF, NS, PTR, SSHFP, SOA - -#----------------------- -# RabbitMQ Config -#----------------------- -[oslo_messaging_rabbit] -#rabbit_userid = guest -#rabbit_password = guest -#rabbit_virtual_host = / -#rabbit_use_ssl = False -#rabbit_hosts = 127.0.0.1:5672 - -######################## -## Service Configuration -######################## -#----------------------- -# Central Service -#----------------------- -[service:central] -# Number of central worker processes to spawn -#workers = None - -# Number of central greenthreads to spawn -#threads = 1000 - -# Maximum zone name length -#max_zone_name_len = 255 - -# Maximum recordset name length -#max_recordset_name_len = 255 - -# Minimum TTL -#min_ttl = None - -# The name of the default pool -#default_pool_id = '794ccc2c-d751-44fe-b57f-8894c9f5c842' - -## Managed resources settings - -# Email to use for managed resources like domains created by the FloatingIP API -#managed_resource_email = hostmaster@example.com. - -# Tenant ID to own all managed resources - like auto-created records etc. -#managed_resource_tenant_id = 123456 - -# What filters to use. They are applied in order listed in the option, from -# left to right -#scheduler_filters = default_pool - -#----------------------- -# API Service -#----------------------- -[service:api] -# Number of api worker processes to spawn -#workers = None - -# Number of api greenthreads to spawn -#threads = 1000 - -# Enable host request headers -#enable_host_header = False - -# The base uri used in responses -#api_base_uri = 'http://127.0.0.1:9001/' - -# API bind host+port pairs, comma separated -#listen = 0.0.0.0:9001 - -# Maximum line size of message headers to be accepted. max_header_line may -# need to be increased when using large tokens (typically those generated by -# the Keystone v3 API with big service catalogs). -#max_header_line = 16384 - -# Authentication strategy to use - can be either "noauth" or "keystone" -#auth_strategy = keystone - -# Enable Version 1 API (deprecated) -#enable_api_v1 = False - -# Enabled API Version 1 extensions -# Can be one or more of : diagnostics, quotas, reports, sync, touch -#enabled_extensions_v1 = - -# Enable Version 2 API -#enable_api_v2 = True - -# Enabled API Version 2 extensions -#enabled_extensions_v2 = - -# Default per-page limit for the V2 API, a value of None means show all results -# by default -#default_limit_v2 = 20 - -# Max page size in the V2 API -#max_limit_v2 = 1000 - -# Enable Admin API (experimental) -#enable_api_admin = False - -# Enabled Admin API extensions -# Can be one or more of : reports, quotas, counts, tenants, target_sync -# zone export is in zones extension -#enabled_extensions_admin = - -# Default per-page limit for the Admin API, a value of None means show all results -# by default -#default_limit_admin = 20 - -# Max page size in the Admin API -#max_limit_admin = 1000 - -# Show the pecan HTML based debug interface (v2 only) -# This is only useful for development, and WILL break python-designateclient -# if an error occurs -#pecan_debug = False - -#----------------------- -# Keystone Middleware -#----------------------- -[keystone_authtoken] -#auth_host = 127.0.0.1 -#auth_port = 35357 -#auth_version = 3 -#auth_protocol = http -#project_name = service -#username = designate -#password = designate -#project_domain_id = default -#user_domain_id = default -#memcached_servers = localhost:11211 -#auth_type = password - -#----------------------- -# CORS Middleware -#----------------------- -[cors] - -# Indicate whether this resource may be shared with the domain received in the -# requests "origin" header. (list value) -#allowed_origin = - -# Indicate that the actual request can include user credentials (boolean value) -#allow_credentials = true - -# Indicate which headers are safe to expose to the API. Defaults to HTTP Simple -# Headers. (list value) -#expose_headers = X-OpenStack-Request-ID,Host - -# Maximum cache age of CORS preflight requests. (integer value) -#max_age = 3600 - -# Indicate which methods can be used during the actual request. (list value) -#allow_methods = GET,PUT,POST,DELETE,PATCH,HEAD - -# Indicate which header field names may be used during the actual request. -# (list value) -#allow_headers = X-Auth-Token,X-Auth-Sudo-Tenant-ID,X-Auth-Sudo-Project-ID,X-Auth-All-Projects,X-Designate-Edit-Managed-Records,OpenStack-DNS-Hide-Counts - -[cors.subdomain] - -# Indicate whether this resource may be shared with the domain received in the -# requests "origin" header. (list value) -#allowed_origin = - -# Indicate that the actual request can include user credentials (boolean value) -#allow_credentials = true - -# Indicate which headers are safe to expose to the API. Defaults to HTTP Simple -# Headers. (list value) -#expose_headers = X-OpenStack-Request-ID,Host - -# Maximum cache age of CORS preflight requests. (integer value) -#max_age = 3600 - -# Indicate which methods can be used during the actual request. (list value) -#allow_methods = GET,PUT,POST,DELETE,PATCH,HEAD - -# Indicate which header field names may be used during the actual request. -# (list value) -#allow_headers = X-Auth-Token,X-Auth-Sudo-Tenant-ID,X-Auth-Sudo-Project-ID,X-Auth-All-Projects,X-Designate-Edit-Managed-Records,OpenStack-DNS-Hide-Counts - -#----------------------- -# Sink Service -#----------------------- -[service:sink] -# List of notification handlers to enable, configuration of these needs to -# correspond to a [handler:my_driver] section below or else in the config -# Can be one or more of : nova_fixed, neutron_floatingip -#enabled_notification_handlers = - -#----------------------- -# mDNS Service -#----------------------- -[service:mdns] -# Number of mdns worker processes to spawn -#workers = None - -# Number of mdns greenthreads to spawn -#threads = 1000 - -# mDNS bind host+port pairs, comma separated -#listen = 0.0.0.0:5354 - -# mDNS TCP Backlog -#tcp_backlog = 100 - -# mDNS TCP Receive Timeout -#tcp_recv_timeout = 0.5 - -# Enforce all incoming queries (including AXFR) are TSIG signed -#query_enforce_tsig = False - -# Send all traffic over TCP -#all_tcp = False - -# Maximum message size to emit -#max_message_size = 65535 - -#----------------------- -# Agent Service -#----------------------- -# The agent runs on the resolver hosts -[service:agent] -#workers = None -#listen = 0.0.0.0:5358 -#tcp_backlog = 100 -#allow_notify = 127.0.0.1 - -# MiniDNS IP address and port -#masters = 127.0.0.1:5354 - -# Set to "fake", "bind9" or "knot2" -#backend_driver = fake - -#transfer_source = None -#notify_delay = 0 - -#----------------------- -# Zone Manager Service -#----------------------- -[service:producer] -# Number of Zone Manager worker processes to spawn -#workers = None - -# Number of Zone Manager greenthreads to spawn -#threads = 1000 - -# List of Zone Manager tasks to enable, a value of None will enable all tasks. -# Can be one or more of: periodic_exists -#enabled_tasks = None - -# Whether to allow synchronous zone exports -#export_synchronous = True - -#------------------------ -# Deleted domains purging -#------------------------ -[producer_task:zone_purge] -# How frequently to purge deleted domains, in seconds -#interval = 3600 # 1h - -# How many records to be deleted on each run -#batch_size = 100 - -# How old deleted records should be (deleted_at) to be purged, in seconds -#time_threshold = 604800 # 7 days - -#------------------------ -# Delayed zones NOTIFY -#------------------------ -[producer_task:delayed_notify] -# How frequently to scan for zones pending NOTIFY, in seconds -#interval = 5 - -#------------------------ -# Worker Periodic Recovery -#------------------------ -[producer_task:worker_periodic_recovery] -# How frequently to scan for zones pending NOTIFY, in seconds -#interval = 120 - -#----------------------- -# Pool Manager Service -#----------------------- -[service:pool_manager] -# Number of Pool Manager worker processes to spawn -#workers = None - -# Number of Pool Manager greenthreads to spawn -#threads = 1000 - -# The ID of the pool managed by this instance of the Pool Manager -#pool_id = 794ccc2c-d751-44fe-b57f-8894c9f5c842 - -# The percentage of servers requiring a successful update for a domain change -# to be considered active -#threshold_percentage = 100 - -# The time to wait for a response from a server -#poll_timeout = 30 - -# The time between retrying to send a request and waiting for a response from a -# server -#poll_retry_interval = 15 - -# The maximum number of times to retry sending a request and wait for a -# response from a server -#poll_max_retries = 10 - -# The time to wait before sending the first request to a server -#poll_delay = 5 - -# Enable the recovery thread -#enable_recovery_timer = True - -# The time between recovering from failures -#periodic_recovery_interval = 120 - -# Enable the sync thread -#enable_sync_timer = True - -# The time between synchronizing the servers with storage -#periodic_sync_interval = 1800 - -# Zones Updated within last N seconds will be syncd. Use None to sync all zones -#periodic_sync_seconds = None - -# Perform multiple update attempts during periodic_sync -#periodic_sync_max_attempts = 3 -#periodic_sync_retry_interval = 30 - -# The cache driver to use -#cache_driver = memcache - - -#----------------------- -# Worker Service -#----------------------- -[service:worker] -# Whether to send events to worker instead of Pool Manager -# enabled = False - -# Number of Worker processes to spawn -#workers = None - -# Number of Worker greenthreads to spawn -#threads = 1000 - -# The percentage of servers requiring a successful update for a zone change -# to be considered active -#threshold_percentage = 100 - -# The time to wait for a response from a server -#poll_timeout = 30 - -# The time between retrying to send a request and waiting for a response from a -# server -#poll_retry_interval = 15 - -# The maximum number of times to retry sending a request and wait for a -# response from a server -#poll_max_retries = 10 - -# The time to wait before sending the first request to a server -#poll_delay = 5 - -# Whether to allow worker to send NOTIFYs. NOTIFY requests to mdns will noop -# notify = False - -################################### -## Pool Manager Cache Configuration -################################### -#----------------------- -# SQLAlchemy Pool Manager Cache -#----------------------- -[pool_manager_cache:sqlalchemy] -#connection = sqlite:///$state_path/designate_pool_manager.sqlite -#connection_debug = 100 -#connection_trace = False -#sqlite_synchronous = True -#idle_timeout = 3600 -#max_retries = 10 -#retry_interval = 10 - -#----------------------- -# Memcache Pool Manager Cache -#----------------------- -[pool_manager_cache:memcache] -#memcached_servers = None -#expiration = 3600 - -############## -## Network API -############## -[network_api:neutron] -# Comma separated list of values, formatted "|" -#endpoints = RegionOne|http://localhost:9696 -#endpoint_type = publicURL -#timeout = 30 -#admin_username = designate -#admin_password = designate -#admin_tenant_name = designate -#auth_url = http://localhost:35357/v2.0 -#insecure = False -#auth_strategy = keystone -#ca_certificates_file = - -######################## -## Storage Configuration -######################## -#----------------------- -# SQLAlchemy Storage -#----------------------- -[storage:sqlalchemy] -# Database connection string - to configure options for a given implementation -# like sqlalchemy or other see below -#connection = sqlite:///$state_path/designate.sqlite -#connection_debug = 0 -#connection_trace = False -#sqlite_synchronous = True -#idle_timeout = 3600 -#max_retries = 10 -#retry_interval = 10 - -######################## -## Handler Configuration -######################## -#----------------------- -# Nova Fixed Handler -#----------------------- -[handler:nova_fixed] -# Zone ID of zone to create records in. Should be pre-created -#zone_id = -#notification_topics = notifications -#control_exchange = 'nova' -#"format" has been depricated. Instead we now have two formaters -#each for IPv4 and IPv6. -#"formatv4" has been defined for IPv4 addresses. -#"formatv6" is for IPv6 addresses. -# -#formatv4 = '%(octet0)s-%(octet1)s-%(octet2)s-%(octet3)s.%(zone)s' -#formatv4 = '%(hostname)s.%(project)s.%(zone)s' -#formatv4 = '%(hostname)s.%(zone)s' -#formatv6 = '%(hostname)s.%(zone)s' -#formatv6 = '%(hostname)s.%(project)s.%(zone)s' -#------------------------ -# Neutron Floating Handler -#------------------------ -[handler:neutron_floatingip] -# Zone ID of zone to create records in. Should be pre-created -#zone_id = -#notification_topics = notifications -#control_exchange = 'neutron' -#formatv4 = '%(octet0)s-%(octet1)s-%(octet2)s-%(octet3)s.%(zone)s' -#formatv4 = '%(hostname)s.%(project)s.%(zone)s' -#formatv4 = '%(hostname)s.%(zone)s' -#formatv6 = '%(hostname)s.%(project)s.%(zone)s' -#formatv6 = '%(hostname)s.%(zone)s' - -############################## -## Agent Backend Configuration -############################## - -# Set backend_driver in the [service:agent] section - -[backend:agent:bind9] -#rndc_host = 127.0.0.1 -#rndc_port = 953 -#rndc_config_file = /etc/rndc.conf -#rndc_key_file = /etc/rndc.key -#zone_file_path = $state_path/zones -#query_destination = 127.0.0.1 - -[backend:agent:knot2] -# knotc command name when rootwrap is used. Location of the knotc executable -# on the resolver host if rootwrap is not used -#knotc_cmd_name = /usr/sbin/knotc -# -[backend:agent:djbdns] -# Command names when rootwrap is used or location of the executables -# on the resolver host when rootwrap is not used -# tcpclient_cmd_name = -# axfr_get_cmd_name = -# tinydns_data_cmd_name = -# tinydns_datadir = -#query_destination = 127.0.0.1 - -[backend:agent:denominator] -#name = dynect -#config_file = /etc/denominator.conf - -[backend:agent:gdnsd] -#gdnsd_cmd_name = gdnsd -#confdir_path = /etc/gdnsd -#query_destination = 127.0.0.1 - -[backend:agent:msdns] -#query_destination = 127.0.0.1 - -######################## -## Library Configuration -######################## -[oslo_concurrency] -# Path for Oslo Concurrency to store lock files, defaults to the value -# of the state_path setting. -#lock_path = $state_path - -######################## -## Coordination -######################## -[coordination] -# URL for the coordination backend to use. -#backend_url = kazoo://127.0.0.1/ - -######################## -## Hook Points -######################## -# Hook Points are enabled when added to the config and there has been -# a package that provides the corresponding named designate.hook_point -# entry point. - -# [hook_point:name_of_hook_point] -# some_param_for_hook = 42 -# Hooks can be disabled in the config -# enabled = False - -# Hook can also be applied to the import path when the hook has not -# been given an explicit name. The name is created from the hook -# target function / method: -# -# name = '%s.%s' % (func.__module__, func.__name__) - -# [hook_point:designate.api.v2.controllers.zones.get_one] - -################## -## Monasca Statsd -################## -[monasca:statsd] -# Disabled by default -# enabled = False -# Statsd server hostname -# hostname = 127.0.0.1 -# Statsd server UDP port -# port = 8125