components/openstack/nova/files/nova.conf
branchs11-update
changeset 4072 db0cec748ec0
parent 3178 77584387a894
child 4049 150852e281c4
--- a/components/openstack/nova/files/nova.conf	Tue Apr 07 15:49:29 2015 -0700
+++ b/components/openstack/nova/files/nova.conf	Tue Apr 07 13:31:20 2015 -0700
@@ -1,14 +1,200 @@
 [DEFAULT]
 
 #
+# Options defined in oslo.messaging
+#
+
+# Use durable queues in AMQP. (boolean value)
+# Deprecated group/name - [DEFAULT]/rabbit_durable_queues
+#amqp_durable_queues=false
+
+# Auto-delete queues in AMQP. (boolean value)
+#amqp_auto_delete=false
+
+# Size of RPC connection pool. (integer value)
+#rpc_conn_pool_size=30
+
+# Qpid broker hostname. (string value)
+#qpid_hostname=localhost
+
+# Qpid broker port. (integer value)
+#qpid_port=5672
+
+# Qpid HA cluster host:port pairs. (list value)
+#qpid_hosts=$qpid_hostname:$qpid_port
+
+# Username for Qpid connection. (string value)
+#qpid_username=
+
+# Password for Qpid connection. (string value)
+#qpid_password=
+
+# Space separated list of SASL mechanisms to use for auth.
+# (string value)
+#qpid_sasl_mechanisms=
+
+# Seconds between connection keepalive heartbeats. (integer
+# value)
+#qpid_heartbeat=60
+
+# Transport to use, either 'tcp' or 'ssl'. (string value)
+#qpid_protocol=tcp
+
+# Whether to disable the Nagle algorithm. (boolean value)
+#qpid_tcp_nodelay=true
+
+# The number of prefetched messages held by receiver. (integer
+# value)
+#qpid_receiver_capacity=1
+
+# The qpid topology version to use.  Version 1 is what was
+# originally used by impl_qpid.  Version 2 includes some
+# backwards-incompatible changes that allow broker federation
+# to work.  Users should update to version 2 when they are
+# able to take everything down, as it requires a clean break.
+# (integer value)
+#qpid_topology_version=1
+
+# SSL version to use (valid only if SSL enabled). valid values
+# are TLSv1 and SSLv23. SSLv2 and SSLv3 may be available on
+# some distributions. (string value)
+#kombu_ssl_version=
+
+# SSL key file (valid only if SSL enabled). (string value)
+#kombu_ssl_keyfile=
+
+# SSL cert file (valid only if SSL enabled). (string value)
+#kombu_ssl_certfile=
+
+# SSL certification authority file (valid only if SSL
+# enabled). (string value)
+#kombu_ssl_ca_certs=
+
+# How long to wait before reconnecting in response to an AMQP
+# consumer cancel notification. (floating point value)
+#kombu_reconnect_delay=1.0
+
+# The RabbitMQ broker address where a single node is used.
+# (string value)
+#rabbit_host=localhost
+
+# The RabbitMQ broker port where a single node is used.
+# (integer value)
+#rabbit_port=5672
+
+# RabbitMQ HA cluster host:port pairs. (list value)
+#rabbit_hosts=$rabbit_host:$rabbit_port
+
+# Connect over SSL for RabbitMQ. (boolean value)
+#rabbit_use_ssl=false
+
+# The RabbitMQ userid. (string value)
+#rabbit_userid=guest
+
+# The RabbitMQ password. (string value)
+#rabbit_password=guest
+
+# The RabbitMQ login method. (string value)
+#rabbit_login_method=AMQPLAIN
+
+# The RabbitMQ virtual host. (string value)
+#rabbit_virtual_host=/
+
+# How frequently to retry connecting with RabbitMQ. (integer
+# value)
+#rabbit_retry_interval=1
+
+# How long to backoff for between retries when connecting to
+# RabbitMQ. (integer value)
+#rabbit_retry_backoff=2
+
+# Maximum number of RabbitMQ connection retries. Default is 0
+# (infinite retry count). (integer value)
+#rabbit_max_retries=0
+
+# Use HA queues in RabbitMQ (x-ha-policy: all). If you change
+# this option, you must wipe the RabbitMQ database. (boolean
+# value)
+#rabbit_ha_queues=false
+
+# Deprecated, use rpc_backend=kombu+memory or rpc_backend=fake
+# (boolean value)
+#fake_rabbit=false
+
+# ZeroMQ bind address. Should be a wildcard (*), an ethernet
+# interface, or IP. The "host" option should point or resolve
+# to this address. (string value)
+#rpc_zmq_bind_address=*
+
+# MatchMaker driver. (string value)
+#rpc_zmq_matchmaker=oslo.messaging._drivers.matchmaker.MatchMakerLocalhost
+
+# ZeroMQ receiver listening port. (integer value)
+#rpc_zmq_port=9501
+
+# Number of ZeroMQ contexts, defaults to 1. (integer value)
+#rpc_zmq_contexts=1
+
+# Maximum number of ingress messages to locally buffer per
+# topic. Default is unlimited. (integer value)
+#rpc_zmq_topic_backlog=<None>
+
+# Directory for holding IPC sockets. (string value)
+#rpc_zmq_ipc_dir=/var/run/openstack
+
+# Name of this node. Must be a valid hostname, FQDN, or IP
+# address. Must match "host" option, if running Nova. (string
+# value)
+#rpc_zmq_host=nova
+
+# Seconds to wait before a cast expires (TTL). Only supported
+# by impl_zmq. (integer value)
+#rpc_cast_timeout=30
+
+# Heartbeat frequency. (integer value)
+#matchmaker_heartbeat_freq=300
+
+# Heartbeat time-to-live. (integer value)
+#matchmaker_heartbeat_ttl=600
+
+# Size of RPC greenthread pool. (integer value)
+#rpc_thread_pool_size=64
+
+# Driver or drivers to handle sending notifications. (multi
+# valued)
+#notification_driver=
+
+# AMQP topic used for OpenStack notifications. (list value)
+# Deprecated group/name - [rpc_notifier2]/topics
+#notification_topics=notifications
+
+# Seconds to wait for a response from a call. (integer value)
+#rpc_response_timeout=60
+
+# A URL representing the messaging driver to use and its full
+# configuration. If not set, we fall back to the rpc_backend
+# option and driver specific configuration. (string value)
+#transport_url=<None>
+
+# The messaging driver to use, defaults to rabbit. Other
+# drivers include qpid and zmq. (string value)
+#rpc_backend=rabbit
+
+# The default exchange under which topics are scoped. May be
+# overridden by an exchange name specified in the
+# transport_url option. (string value)
+#control_exchange=openstack
+
+
+#
 # Options defined in nova.availability_zones
 #
 
-# availability_zone to show internal services under (string
-# value)
+# The availability_zone to show internal services under
+# (string value)
 #internal_service_availability_zone=internal
 
-# default compute node availability_zone (string value)
+# Default compute node availability_zone (string value)
 #default_availability_zone=nova
 
 
@@ -47,7 +233,7 @@
 # Options defined in nova.exception
 #
 
-# make exception message format errors fatal (boolean value)
+# Make exception message format errors fatal (boolean value)
 #fatal_exception_format_errors=false
 
 
@@ -55,7 +241,7 @@
 # Options defined in nova.netconf
 #
 
-# ip address of this host (string value)
+# IP address of this host (string value)
 #my_ip=10.0.0.1
 
 # Name of this node.  This can be an opaque identifier.  It is
@@ -64,7 +250,7 @@
 # ZeroMQ, a valid hostname, FQDN, or IP address (string value)
 #host=nova
 
-# use ipv6 (boolean value)
+# Use IPv6 (boolean value)
 #use_ipv6=false
 
 
@@ -83,6 +269,14 @@
 # the API service. (boolean value)
 #notify_api_faults=false
 
+# Default notification level for outgoing notifications
+# (string value)
+#default_notification_level=INFO
+
+# Default publisher_id for outgoing notifications (string
+# value)
+#default_publisher_id=<None>
+
 
 #
 # Options defined in nova.paths
@@ -90,7 +284,7 @@
 
 # Directory where the nova python module is installed (string
 # value)
-#pybasedir=/usr/lib/python2.6/vendor-packages
+pybasedir=/usr/lib/python2.6/vendor-packages
 
 # Directory where nova binaries are installed (string value)
 bindir=/usr/bin
@@ -101,73 +295,68 @@
 
 
 #
-# Options defined in nova.policy
-#
-
-# JSON file representing policy (string value)
-#policy_file=policy.json
-
-# Rule checked when requested rule is not found (string value)
-#policy_default_rule=default
-
-
-#
 # Options defined in nova.quota
 #
 
-# number of instances allowed per project (integer value)
+# Number of instances allowed per project (integer value)
 #quota_instances=10
 
-# number of instance cores allowed per project (integer value)
+# Number of instance cores allowed per project (integer value)
 #quota_cores=20
 
-# megabytes of instance ram allowed per project (integer
+# Megabytes of instance RAM allowed per project (integer
 # value)
 #quota_ram=51200
 
-# number of floating ips allowed per project (integer value)
+# Number of floating IPs allowed per project (integer value)
 #quota_floating_ips=10
 
-# number of fixed ips allowed per project (this should be at
+# Number of fixed IPs allowed per project (this should be at
 # least the number of instances allowed) (integer value)
 #quota_fixed_ips=-1
 
-# number of metadata items allowed per instance (integer
+# Number of metadata items allowed per instance (integer
 # value)
 #quota_metadata_items=128
 
-# number of injected files allowed (integer value)
+# Number of injected files allowed (integer value)
 #quota_injected_files=5
 
-# number of bytes allowed per injected file (integer value)
+# Number of bytes allowed per injected file (integer value)
 #quota_injected_file_content_bytes=10240
 
-# number of bytes allowed per injected file path (integer
-# value)
-#quota_injected_file_path_bytes=255
-
-# number of security groups per project (integer value)
+# Length of injected file path (integer value)
+# Deprecated group/name - [DEFAULT]/quota_injected_file_path_bytes
+#quota_injected_file_path_length=255
+
+# Number of security groups per project (integer value)
 #quota_security_groups=10
 
-# number of security rules per security group (integer value)
+# Number of security rules per security group (integer value)
 #quota_security_group_rules=20
 
-# number of key pairs per user (integer value)
+# Number of key pairs per user (integer value)
 #quota_key_pairs=100
 
-# number of seconds until a reservation expires (integer
+# Number of server groups per project (integer value)
+#quota_server_groups=10
+
+# Number of servers per server group (integer value)
+#quota_server_group_members=10
+
+# Number of seconds until a reservation expires (integer
 # value)
 #reservation_expire=86400
 
-# count of reservations until usage is refreshed (integer
+# Count of reservations until usage is refreshed (integer
 # value)
 #until_refresh=0
 
-# number of seconds between subsequent usage refreshes
+# Number of seconds between subsequent usage refreshes
 # (integer value)
 #max_age=0
 
-# default driver to use for quota checks (string value)
+# Default driver to use for quota checks (string value)
 #quota_driver=nova.quota.DbQuotaDriver
 
 
@@ -175,71 +364,82 @@
 # Options defined in nova.service
 #
 
-# seconds between nodes reporting state to datastore (integer
+# Seconds between nodes reporting state to datastore (integer
 # value)
 #report_interval=10
 
-# enable periodic tasks (boolean value)
+# Enable periodic tasks (boolean value)
 #periodic_enable=true
 
-# range of seconds to randomly delay when starting the
+# Range of seconds to randomly delay when starting the
 # periodic task scheduler to reduce stampeding. (Disable by
 # setting to 0) (integer value)
 #periodic_fuzzy_delay=60
 
-# a list of APIs to enable by default (list value)
+# A list of APIs to enable by default (list value)
 #enabled_apis=ec2,osapi_compute,metadata
 
-# a list of APIs with enabled SSL (list value)
+# A list of APIs with enabled SSL (list value)
 #enabled_ssl_apis=
 
-# IP address for EC2 API to listen (string value)
+# The IP address on which the EC2 API will listen. (string
+# value)
 #ec2_listen=0.0.0.0
 
-# port for ec2 api to listen (integer value)
+# The port on which the EC2 API will listen. (integer value)
 #ec2_listen_port=8773
 
-# Number of workers for EC2 API service (integer value)
-#ec2_workers=<None>
-
-# IP address for OpenStack API to listen (string value)
+# Number of workers for EC2 API service. The default will be
+# equal to the number of CPUs available. (integer value)
+ec2_workers=1
+
+# The IP address on which the OpenStack API will listen.
+# (string value)
 #osapi_compute_listen=0.0.0.0
 
-# list port for osapi compute (integer value)
+# The port on which the OpenStack API will listen. (integer
+# value)
 #osapi_compute_listen_port=8774
 
-# Number of workers for OpenStack API service (integer value)
-#osapi_compute_workers=<None>
+# Number of workers for OpenStack API service. The default
+# will be the number of CPUs available. (integer value)
+osapi_compute_workers=1
 
 # OpenStack metadata service manager (string value)
 #metadata_manager=nova.api.manager.MetadataManager
 
-# IP address for metadata api to listen (string value)
+# The IP address on which the metadata API will listen.
+# (string value)
 #metadata_listen=0.0.0.0
 
-# port for metadata api to listen (integer value)
+# The port on which the metadata API will listen. (integer
+# value)
 #metadata_listen_port=8775
 
-# Number of workers for metadata service (integer value)
-#metadata_workers=<None>
-
-# full class name for the Manager for compute (string value)
+# Number of workers for metadata service. The default will be
+# the number of CPUs available. (integer value)
+metadata_workers=1
+
+# Full class name for the Manager for compute (string value)
 #compute_manager=nova.compute.manager.ComputeManager
 
-# full class name for the Manager for console proxy (string
+# Full class name for the Manager for console proxy (string
 # value)
 #console_manager=nova.console.manager.ConsoleProxyManager
 
-# full class name for the Manager for cert (string value)
+# Manager for console auth (string value)
+#consoleauth_manager=nova.consoleauth.manager.ConsoleAuthManager
+
+# Full class name for the Manager for cert (string value)
 #cert_manager=nova.cert.manager.CertManager
 
-# full class name for the Manager for network (string value)
+# Full class name for the Manager for network (string value)
 #network_manager=nova.network.manager.VlanManager
 
-# full class name for the Manager for scheduler (string value)
+# Full class name for the Manager for scheduler (string value)
 #scheduler_manager=nova.scheduler.manager.SchedulerManager
 
-# maximum time since last check-in for up service (integer
+# Maximum time since last check-in for up service (integer
 # value)
 #service_down_time=60
 
@@ -265,7 +465,7 @@
 # Length of generated instance admin passwords (integer value)
 #password_length=12
 
-# time period to generate instance usages for.  Time period
+# Time period to generate instance usages for.  Time period
 # must be hour, day, month or year (string value)
 #instance_usage_audit_period=month
 
@@ -306,18 +506,39 @@
 # socket. Not supported on OS X. (integer value)
 #tcp_keepidle=600
 
+# Size of the pool of greenthreads used by wsgi (integer
+# value)
+#wsgi_default_pool_size=1000
+
+# 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). (integer value)
+#max_header_line=16384
+
+# If False, closes the client socket connection explicitly.
+# (boolean value)
+#wsgi_keep_alive=true
+
+# Timeout for client connections' socket operations. If an
+# incoming connection is idle for this number of seconds it
+# will be closed. A value of '0' means wait forever. (integer
+# value)
+#client_socket_timeout=0
+
 
 #
 # Options defined in nova.api.auth
 #
 
-# whether to use per-user rate limiting for the api. (boolean
-# value)
+# Whether to use per-user rate limiting for the api. This
+# option is only used by v2 api. Rate limiting is removed from
+# v3 api. (boolean value)
 #api_rate_limit=false
 
 # The strategy to use for auth: noauth or keystone. (string
 # value)
-auth_strategy=keystone
+#auth_strategy=keystone
 
 # Treat X-Forwarded-For as the canonical remote address. Only
 # enable this if you have a sanitizing proxy. (boolean value)
@@ -356,24 +577,24 @@
 # Options defined in nova.api.ec2.cloud
 #
 
-# the ip of the ec2 api server (string value)
+# The IP address of the EC2 API server (string value)
 #ec2_host=$my_ip
 
-# the internal ip of the ec2 api server (string value)
+# The internal IP address of the EC2 API server (string value)
 #ec2_dmz_host=$my_ip
 
-# the port of the ec2 api server (integer value)
+# The port of the EC2 API server (integer value)
 #ec2_port=8773
 
-# the protocol to use when connecting to the ec2 api server
+# The protocol to use when connecting to the EC2 API server
 # (http, https) (string value)
 #ec2_scheme=http
 
-# the path prefix used to call the ec2 api server (string
+# The path prefix used to call the ec2 API server (string
 # value)
 #ec2_path=/services/Cloud
 
-# list of region=fqdn pairs separated by commas (list value)
+# List of region=fqdn pairs separated by commas (list value)
 #region_list=
 
 
@@ -390,23 +611,10 @@
 
 
 #
-# Options defined in nova.api.metadata.handler
-#
-
-# Set flag to indicate Neutron will proxy metadata requests
-# and resolve instance ids. (boolean value)
-#service_neutron_metadata_proxy=false
-
-# Shared secret to validate proxies Neutron metadata requests
-# (string value)
-#neutron_metadata_proxy_shared_secret=
-
-
-#
 # Options defined in nova.api.metadata.vendordata_json
 #
 
-# File to load json formated vendor data from (string value)
+# File to load JSON formatted vendor data from (string value)
 #vendordata_jsonfile_path=<None>
 
 
@@ -414,7 +622,7 @@
 # Options defined in nova.api.openstack.common
 #
 
-# the maximum number of items returned in a single response
+# The maximum number of items returned in a single response
 # from a collection resource (integer value)
 #osapi_max_limit=1000
 
@@ -491,8 +699,10 @@
 # Options defined in nova.api.openstack.compute.servers
 #
 
-# Allows use of instance password during server creation
-# (boolean value)
+# Enables returning of the instance password by the relevant
+# server API calls such as create, rebuild or rescue, If the
+# hypervisor does not support password injection then the
+# password returned will not be correct (boolean value)
 #enable_instance_password=true
 
 
@@ -500,25 +710,16 @@
 # Options defined in nova.api.sizelimit
 #
 
-# the maximum body size per each osapi request(bytes) (integer
+# The maximum body size per each osapi request(bytes) (integer
 # value)
 #osapi_max_request_body_size=114688
 
 
 #
-# Options defined in nova.cells.opts
-#
-
-# The full class name of the compute API class to use
-# (deprecated) (string value)
-#compute_api_class=nova.compute.api.API
-
-
-#
 # Options defined in nova.cert.rpcapi
 #
 
-# the topic cert nodes listen on (string value)
+# The topic cert nodes listen on (string value)
 #cert_topic=cert
 
 
@@ -526,7 +727,7 @@
 # Options defined in nova.cloudpipe.pipelib
 #
 
-# image id used when starting up a cloudpipe vpn server
+# Image ID used when starting up a cloudpipe vpn server
 # (string value)
 #vpn_image_id=0
 
@@ -587,18 +788,6 @@
 
 
 #
-# Options defined in nova.cmd.spicehtml5proxy
-#
-
-# Host on which to listen for incoming requests (string value)
-#spicehtml5proxy_host=0.0.0.0
-
-# Port on which to listen for incoming requests (integer
-# value)
-#spicehtml5proxy_port=6082
-
-
-#
 # Options defined in nova.compute.api
 #
 
@@ -610,7 +799,7 @@
 # in single-host environments. (boolean value)
 #allow_migrate_to_same_host=false
 
-# availability zone to use when user doesn't specify one
+# Availability zone to use when user doesn't specify one
 # (string value)
 #default_schedule_zone=<None>
 
@@ -618,7 +807,7 @@
 # inherit from an instance (list value)
 #non_inheritable_image_properties=cache_in_nova,bittorrent
 
-# kernel image that indicates not to use a kernel, but to use
+# Kernel image that indicates not to use a kernel, but to use
 # a raw disk image instead (string value)
 #null_kernel=nokernel
 
@@ -642,7 +831,7 @@
 # Options defined in nova.compute.flavors
 #
 
-# default flavor to use for the EC2 API only. The Nova API
+# Default flavor to use for the EC2 API only. The Nova API
 # does not support a default flavor. (string value)
 #default_flavor=m1.small
 
@@ -655,7 +844,7 @@
 # host. (string value)
 #console_host=nova
 
-# Name of network to use to set access ips for instances
+# Name of network to use to set access IPs for instances
 # (string value)
 #default_access_ip_network_name=<None>
 
@@ -664,7 +853,7 @@
 # (boolean value)
 #defer_iptables_apply=false
 
-# where instances are stored on disk (string value)
+# Where instances are stored on disk (string value)
 #instances_path=$state_path/instances
 
 # Generate periodic compute.instance.exists notifications
@@ -683,29 +872,30 @@
 # (integer value)
 #network_allocate_retries=0
 
+# Number of times to retry block device allocation on failures
+# (integer value)
+#block_device_allocate_retries=60
+
 # The number of times to attempt to reap an instance's files.
 # (integer value)
 #maximum_instance_delete_attempts=5
 
-# interval to pull bandwidth usage info (integer value)
+# Interval to pull network bandwidth usage info. Not supported
+# on all hypervisors. Set to -1 to disable. Setting this to 0
+# will disable, but this will change in the K release to mean
+# "run at the default rate". (integer value)
 #bandwidth_poll_interval=600
 
-# interval to sync power states between the database and the
-# hypervisor (integer value)
+# Interval to sync power states between the database and the
+# hypervisor. Set to -1 to disable. Setting this to 0 will
+# disable, but this will change in Juno to mean "run at the
+# default rate". (integer value)
 #sync_power_state_interval=600
 
 # Number of seconds between instance info_cache self healing
 # updates (integer value)
 #heal_instance_info_cache_interval=60
 
-# Interval in seconds for querying the host status (integer
-# value)
-#host_state_interval=120
-
-# Number of seconds to wait between runs of the image cache
-# manager (integer value)
-#image_cache_manager_interval=2400
-
 # Interval in seconds for reclaiming deleted instances
 # (integer value)
 #reclaim_instance_interval=0
@@ -714,8 +904,10 @@
 # value)
 #volume_usage_poll_interval=0
 
-# Interval in seconds for polling shelved instances to offload
-# (integer value)
+# Interval in seconds for polling shelved instances to
+# offload. Set to -1 to disable.Setting this to 0 will
+# disable, but this will change in Juno to mean "run at the
+# default rate". (integer value)
 #shelved_poll_interval=3600
 
 # Time in seconds before a shelved instance is eligible for
@@ -727,10 +919,14 @@
 # deletes (integer value)
 #instance_delete_interval=300
 
+# Waiting time interval (seconds) between block device
+# allocation retries on failures (integer value)
+#block_device_allocate_retries_interval=3
+
 # Action to take if a running deleted instance is
-# detected.Valid options are 'noop', 'log' and 'reap'. Set to
-# 'noop' to disable. (string value)
-#running_deleted_instance_action=log
+# detected.Valid options are 'noop', 'log', 'shutdown', or
+# 'reap'. Set to 'noop' to take no action. (string value)
+#running_deleted_instance_action=reap
 
 # Number of seconds to wait between runs of the cleanup task.
 # (integer value)
@@ -758,6 +954,23 @@
 # disable. (integer value)
 #resize_confirm_window=0
 
+# Total amount of time to wait in seconds for an instance to
+# perform a clean shutdown. (integer value)
+#shutdown_timeout=60
+
+
+#
+# Options defined in nova.compute.monitors
+#
+
+# Monitor classes available to the compute which may be
+# specified more than once. (multi valued)
+#compute_available_monitors=nova.compute.monitors.all_monitors
+
+# A list of monitors that can be used for getting compute
+# metrics. (list value)
+#compute_monitors=
+
 
 #
 # Options defined in nova.compute.resource_tracker
@@ -774,12 +987,15 @@
 # (string value)
 #compute_stats_class=nova.compute.stats.Stats
 
+# The names of the extra resources to track. (list value)
+#compute_resources=vcpu
+
 
 #
 # Options defined in nova.compute.rpcapi
 #
 
-# the topic compute nodes listen on (string value)
+# The topic compute nodes listen on (string value)
 #compute_topic=compute
 
 
@@ -811,7 +1027,7 @@
 # Options defined in nova.console.rpcapi
 #
 
-# the topic console proxy nodes listen on (string value)
+# The topic console proxy nodes listen on (string value)
 #console_topic=console
 
 
@@ -819,11 +1035,11 @@
 # Options defined in nova.console.vmrc
 #
 
-# port for VMware VMRC connections (integer value)
+# DEPRECATED. Port for VMware VMRC connections (integer value)
 #console_vmrc_port=443
 
-# number of retries for retrieving VMRC information (integer
-# value)
+# DEPRECATED. Number of retries for retrieving VMRC
+# information (integer value)
 #console_vmrc_error_retries=10
 
 
@@ -834,7 +1050,7 @@
 # XVP conf template (string value)
 #console_xvp_conf_template=$pybasedir/nova/console/xvp.conf.template
 
-# generated XVP conf file (string value)
+# Generated XVP conf file (string value)
 #console_xvp_conf=/etc/xvp.conf
 
 # XVP master process pid file (string value)
@@ -843,7 +1059,7 @@
 # XVP log file (string value)
 #console_xvp_log=/var/log/xvp.log
 
-# port for XVP to multiplex VNC connections on (integer value)
+# Port for XVP to multiplex VNC connections on (integer value)
 #console_xvp_multiplex_port=5900
 
 
@@ -851,7 +1067,7 @@
 # Options defined in nova.consoleauth
 #
 
-# the topic console auth proxy nodes listen on (string value)
+# The topic console auth proxy nodes listen on (string value)
 #consoleauth_topic=consoleauth
 
 
@@ -862,9 +1078,6 @@
 # How many seconds before deleting tokens (integer value)
 #console_token_ttl=600
 
-# Manager for console auth (string value)
-#consoleauth_manager=nova.consoleauth.manager.ConsoleAuthManager
-
 
 #
 # Options defined in nova.db.api
@@ -887,7 +1100,7 @@
 # Options defined in nova.db.base
 #
 
-# driver to use for database access (string value)
+# The driver to use for database access (string value)
 #db_driver=nova.db
 
 
@@ -902,64 +1115,31 @@
 
 
 #
-# Options defined in nova.image.glance
-#
-
-# default glance hostname or ip (string value)
-#glance_host=$my_ip
-
-# default glance port (integer value)
-#glance_port=9292
-
-# Default protocol to use when connecting to glance. Set to
-# https for SSL. (string value)
-#glance_protocol=http
-
-# A list of the glance api servers available to nova. Prefix
-# with https:// for ssl-based glance api servers.
-# ([hostname|ip]:port) (list value)
-#glance_api_servers=$glance_host:$glance_port
-
-# Allow to perform insecure SSL (https) requests to glance
-# (boolean value)
-#glance_api_insecure=false
-
-# Number retries when downloading an image from glance
-# (integer value)
-#glance_num_retries=0
-
-# A list of url scheme that can be downloaded directly via the
-# direct_url.  Currently supported schemes: [file]. (list
-# value)
-#allowed_direct_url_schemes=
-
-
-#
 # Options defined in nova.image.s3
 #
 
-# parent dir for tempdir used for image decryption (string
-# value)
+# Parent directory for tempdir used for image decryption
+# (string value)
 #image_decryption_dir=/tmp
 
-# hostname or ip for OpenStack to use when accessing the s3
+# Hostname or IP for OpenStack to use when accessing the S3
 # api (string value)
 #s3_host=$my_ip
 
-# port used when accessing the s3 api (integer value)
+# Port used when accessing the S3 api (integer value)
 #s3_port=3333
 
-# access key to use for s3 server for images (string value)
+# Access key to use for S3 server for images (string value)
 #s3_access_key=notchecked
 
-# secret key to use for s3 server for images (string value)
+# Secret key to use for S3 server for images (string value)
 #s3_secret_key=notchecked
 
-# whether to use ssl when talking to s3 (boolean value)
+# Whether to use SSL when talking to S3 (boolean value)
 #s3_use_ssl=false
 
-# whether to affix the tenant id to the access key when
-# downloading from s3 (boolean value)
+# Whether to affix the tenant id to the access key when
+# downloading from S3 (boolean value)
 #s3_affix_tenant=false
 
 
@@ -985,28 +1165,28 @@
 #
 
 # Driver to use for network creation (string value)
-#network_driver=nova.network.linux_net
+network_driver=nova.network.solaris_net
 
 
 #
 # Options defined in nova.network.floating_ips
 #
 
-# Default pool for floating ips (string value)
+# Default pool for floating IPs (string value)
 #default_floating_pool=nova
 
-# Autoassigning floating ip to VM (boolean value)
+# Autoassigning floating IP to VM (boolean value)
 #auto_assign_floating_ip=false
 
-# full class name for the DNS Manager for floating IPs (string
+# Full class name for the DNS Manager for floating IPs (string
 # value)
 #floating_ip_dns_manager=nova.network.noop_dns_driver.NoopDNSDriver
 
-# full class name for the DNS Manager for instance IPs (string
+# Full class name for the DNS Manager for instance IPs (string
 # value)
 #instance_dns_manager=nova.network.noop_dns_driver.NoopDNSDriver
 
-# full class name for the DNS Zone for instance IPs (string
+# Full class name for the DNS Zone for instance IPs (string
 # value)
 #instance_dns_domain=
 
@@ -1015,39 +1195,39 @@
 # Options defined in nova.network.ldapdns
 #
 
-# URL for ldap server which will store dns entries (string
+# URL for LDAP server which will store DNS entries (string
 # value)
 #ldap_dns_url=ldap://ldap.example.com:389
 
-# user for ldap DNS (string value)
+# User for LDAP DNS (string value)
 #ldap_dns_user=uid=admin,ou=people,dc=example,dc=org
 
-# password for ldap DNS (string value)
+# Password for LDAP DNS (string value)
 #ldap_dns_password=password
 
-# Hostmaster for ldap dns driver Statement of Authority
+# Hostmaster for LDAP DNS driver Statement of Authority
 # (string value)
 #[email protected]
 
-# DNS Servers for ldap dns driver (multi valued)
+# DNS Servers for LDAP DNS driver (multi valued)
 #ldap_dns_servers=dns.example.org
 
-# Base DN for DNS entries in ldap (string value)
+# Base DN for DNS entries in LDAP (string value)
 #ldap_dns_base_dn=ou=hosts,dc=example,dc=org
 
-# Refresh interval (in seconds) for ldap dns driver Statement
+# Refresh interval (in seconds) for LDAP DNS driver Statement
 # of Authority (string value)
 #ldap_dns_soa_refresh=1800
 
-# Retry interval (in seconds) for ldap dns driver Statement of
+# Retry interval (in seconds) for LDAP DNS driver Statement of
 # Authority (string value)
 #ldap_dns_soa_retry=3600
 
-# Expiry interval (in seconds) for ldap dns driver Statement
+# Expiry interval (in seconds) for LDAP DNS driver Statement
 # of Authority (string value)
 #ldap_dns_soa_expiry=86400
 
-# Minimum interval (in seconds) for ldap dns driver Statement
+# Minimum interval (in seconds) for LDAP DNS driver Statement
 # of Authority (string value)
 #ldap_dns_soa_minimum=7200
 
@@ -1056,7 +1236,7 @@
 # Options defined in nova.network.linux_net
 #
 
-# location of flagfiles for dhcpbridge (multi valued)
+# Location of flagfiles for dhcpbridge (multi valued)
 #dhcpbridge_flagfile=/etc/nova/nova-dhcpbridge.conf
 
 # Location to keep network config files (string value)
@@ -1065,23 +1245,20 @@
 # Interface for public IP addresses (string value)
 #public_interface=eth0
 
-# MTU setting for vlan (string value)
-#network_device_mtu=<None>
-
-# location of nova-dhcpbridge (string value)
+# Location of nova-dhcpbridge (string value)
 #dhcpbridge=$bindir/nova-dhcpbridge
 
 # Public IP of network host (string value)
 #routing_source_ip=$my_ip
 
 # Lifetime of a DHCP lease in seconds (integer value)
-#dhcp_lease_time=120
-
-# if set, uses specific dns server for dnsmasq. Canbe
+#dhcp_lease_time=86400
+
+# If set, uses specific DNS server for dnsmasq. Can be
 # specified multiple times. (multi valued)
 #dns_server=
 
-# if set, uses the dns1 and dns2 from the network ref.as dns
+# If set, uses the dns1 and dns2 from the network ref. as dns
 # servers. (boolean value)
 #use_network_dns_servers=false
 
@@ -1104,10 +1281,10 @@
 # value)
 #linuxnet_ovs_integration_bridge=br-int
 
-# send gratuitous ARPs for HA setup (boolean value)
+# Send gratuitous ARPs for HA setup (boolean value)
 #send_arp_for_ha=false
 
-# send this many gratuitous ARPs for HA setup (integer value)
+# Send this many gratuitous ARPs for HA setup (integer value)
 #send_arp_for_ha_count=3
 
 # Use single default gateway. Only first nic of vm will get
@@ -1119,10 +1296,10 @@
 # multiple times. (multi valued)
 #forward_bridge_interface=all
 
-# the ip for the metadata api server (string value)
+# The IP address for the metadata API server (string value)
 #metadata_host=$my_ip
 
-# the port for the metadata api port (integer value)
+# The port for the metadata API port (integer value)
 #metadata_port=8775
 
 # Regular expression to match iptables rule that should always
@@ -1137,6 +1314,15 @@
 # dropped. (string value)
 #iptables_drop_action=DROP
 
+# Amount of time, in seconds, that ovs_vsctl should wait for a
+# response from the database. 0 is to wait forever. (integer
+# value)
+#ovs_vsctl_timeout=120
+
+# If passed, use fake network devices and addresses (boolean
+# value)
+#fake_network=false
+
 
 #
 # Options defined in nova.network.manager
@@ -1145,7 +1331,7 @@
 # Bridge for simple network instances (string value)
 #flat_network_bridge=<None>
 
-# Dns for simple network (string value)
+# DNS server for simple network (string value)
 #flat_network_dns=8.8.4.4
 
 # Whether to attempt to inject network setup into guest
@@ -1159,7 +1345,7 @@
 # First VLAN for private networks (integer value)
 #vlan_start=100
 
-# vlans will bridge into this interface if set (string value)
+# VLANs will bridge into this interface if set (string value)
 #vlan_interface=<None>
 
 # Number of networks to support (integer value)
@@ -1186,7 +1372,7 @@
 # Number of addresses reserved for vpn clients (integer value)
 #cnt_vpn_clients=0
 
-# Seconds after which a deallocated ip is disassociated
+# Seconds after which a deallocated IP is disassociated
 # (integer value)
 #fixed_ip_disassociate_timeout=600
 
@@ -1194,10 +1380,6 @@
 # value)
 #create_unique_mac_address_attempts=5
 
-# If passed, use fake network devices and addresses (boolean
-# value)
-#fake_network=false
-
 # If True, skip using the queue and make local calls (boolean
 # value)
 #fake_call=false
@@ -1211,12 +1393,6 @@
 # (boolean value)
 #force_dhcp_release=true
 
-# If True in multi_host mode, all compute hosts share the same
-# dhcp address. The same IP address used for DHCP will be
-# added on each nova-network node which is only visible to the
-# vms on the same host. (boolean value)
-#share_dhcp_address=false
-
 # If True, when a DNS entry must be updated, it sends a fanout
 # cast to all network hosts to update their DNS entries in
 # multi host mode (boolean value)
@@ -1226,7 +1402,7 @@
 # entries. (integer value)
 #dns_update_periodic_interval=-1
 
-# domain to use for building the hostnames (string value)
+# Domain to use for building the hostnames (string value)
 #dhcp_domain=novalocal
 
 # Indicates underlying L3 management library (string value)
@@ -1234,64 +1410,10 @@
 
 
 #
-# Options defined in nova.network.neutronv2.api
-#
-
-# URL for connecting to neutron (string value)
-#neutron_url=http://127.0.0.1:9696
-
-# timeout value for connecting to neutron in seconds (integer
-# value)
-#neutron_url_timeout=30
-
-# username for connecting to neutron in admin context (string
-# value)
-#neutron_admin_username=<None>
-
-# password for connecting to neutron in admin context (string
-# value)
-#neutron_admin_password=<None>
-
-# tenant name for connecting to neutron in admin context
-# (string value)
-#neutron_admin_tenant_name=<None>
-
-# region name for connecting to neutron in admin context
-# (string value)
-#neutron_region_name=<None>
-
-# auth url for connecting to neutron in admin context (string
-# value)
-#neutron_admin_auth_url=http://localhost:5000/v2.0
-
-# if set, ignore any SSL validation issues (boolean value)
-#neutron_api_insecure=false
-
-# auth strategy for connecting to neutron in admin context
-# (string value)
-#neutron_auth_strategy=keystone
-
-# Name of Integration Bridge used by Open vSwitch (string
-# value)
-#neutron_ovs_bridge=br-int
-
-# Number of seconds before querying neutron for extensions
-# (integer value)
-#neutron_extension_sync_interval=600
-
-# Location of ca certificates file to use for neutron client
-# requests. (string value)
-#neutron_ca_certificates_file=<None>
-
-# Use per-port DHCP options with Neutron (boolean value)
-#dhcp_options_enabled=false
-
-
-#
 # Options defined in nova.network.rpcapi
 #
 
-# the topic network nodes listen on (string value)
+# The topic network nodes listen on (string value)
 #network_topic=network
 
 # Default value for multi_host in networks. Also, if set, some
@@ -1309,42 +1431,47 @@
 
 
 #
+# Options defined in nova.objects.network
+#
+
+# DEPRECATED: THIS VALUE SHOULD BE SET WHEN CREATING THE
+# NETWORK. If True in multi_host mode, all compute hosts share
+# the same dhcp address. The same IP address used for DHCP
+# will be added on each nova-network node which is only
+# visible to the vms on the same host. (boolean value)
+#share_dhcp_address=false
+
+# DEPRECATED: THIS VALUE SHOULD BE SET WHEN CREATING THE
+# NETWORK. MTU setting for network interface. (integer value)
+#network_device_mtu=<None>
+
+
+#
 # Options defined in nova.objectstore.s3server
 #
 
-# path to s3 buckets (string value)
+# Path to S3 buckets (string value)
 #buckets_path=$state_path/buckets
 
 # IP address for S3 API to listen (string value)
 #s3_listen=0.0.0.0
 
-# port for s3 api to listen (integer value)
+# Port for S3 API to listen (integer value)
 #s3_listen_port=3333
 
 
 #
-# Options defined in nova.openstack.common.db.sqlalchemy.session
-#
-
-# the filename to use with sqlite (string value)
-#sqlite_db=nova.sqlite
-
-# If true, use synchronous mode for sqlite (boolean value)
-#sqlite_synchronous=true
-
-
-#
 # Options defined in nova.openstack.common.eventlet_backdoor
 #
 
-# Enable eventlet backdoor. Acceptable values are 0, <port>
+# Enable eventlet backdoor.  Acceptable values are 0, <port>,
 # and <start>:<end>, where 0 results in listening on a random
-# tcp port number, <port> results in listening on the
-# specified port number and not enabling backdoorif it is in
-# use and <start>:<end> results in listening on the smallest
-# unused port number within the specified range of port
-# numbers. The chosen port is displayed in the service's log
-# file. (string value)
+# tcp port number; <port> results in listening on the
+# specified port number (and not enabling backdoor if that
+# port is in use); and <start>:<end> results in listening on
+# the smallest unused port number within the specified range
+# of port numbers.  The chosen port is displayed in the
+# service's log file. (string value)
 #backdoor_port=<None>
 
 
@@ -1352,11 +1479,11 @@
 # Options defined in nova.openstack.common.lockutils
 #
 
-# Whether to disable inter-process locks (boolean value)
+# Enables or disables inter-process locks. (boolean value)
 #disable_process_locking=false
 
 # Directory to use for lock files. (string value)
-lock_path=$state_path
+lock_path=$state_path/lock
 
 
 #
@@ -1371,48 +1498,50 @@
 # of default WARNING level). (boolean value)
 #verbose=false
 
-# Log output to standard error (boolean value)
+# Log output to standard error. (boolean value)
 #use_stderr=true
 
-# format string to use for log messages with context (string
+# 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)s %(tenant)s] %(instance)s%(message)s
-
-# format string to use for log messages without context
+#logging_context_format_string=%(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 without context.
 # (string value)
 #logging_default_format_string=%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s
 
-# data to append to log format when level is DEBUG (string
+# Data to append to log format when level is DEBUG. (string
 # value)
 #logging_debug_format_suffix=%(funcName)s %(pathname)s:%(lineno)d
 
-# prefix each line of exception output with this format
+# Prefix each line of exception output with this format.
 # (string value)
 #logging_exception_prefix=%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s
 
-# list of logger=LEVEL pairs (list value)
-#default_log_levels=amqplib=WARN,sqlalchemy=WARN,boto=WARN,suds=INFO,keystone=INFO,eventlet.wsgi.server=WARN
-
-# publish error events (boolean value)
+# List of logger=LEVEL pairs. (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,keystonemiddleware=WARN,routes.middleware=WARN,stevedore=WARN
+
+# Enables or disables publication of error events. (boolean
+# value)
 #publish_errors=false
 
-# make deprecations fatal (boolean value)
+# Enables or disables fatal status of deprecations. (boolean
+# value)
 #fatal_deprecations=false
 
-# If an instance is passed with the log message, format it
-# like this (string value)
+# The format for an instance that is passed with the log
+# message. (string value)
 #instance_format="[instance: %(uuid)s] "
 
-# If an instance UUID is passed with the log message, format
-# it like this (string value)
+# The format for an instance UUID that is passed with the log
+# message. (string value)
 #instance_uuid_format="[instance: %(uuid)s] "
 
-# If this option is specified, the logging configuration file
-# specified is used and overrides any other logging options
-# specified. Please see the Python logging module
-# documentation for details on logging configuration files.
-# (string value)
-#log_config=<None>
+# 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. (string value)
+# Deprecated group/name - [DEFAULT]/log_config
+#log_config_append=<None>
 
 # DEPRECATED. A logging.Formatter log message format string
 # which may use any of the available logging.LogRecord
@@ -1422,21 +1551,32 @@
 #log_format=<None>
 
 # Format string for %%(asctime)s in log records. Default:
-# %(default)s (string value)
+# %(default)s . (string value)
 #log_date_format=%Y-%m-%d %H:%M:%S
 
 # (Optional) Name of log file to output to. If no default is
 # set, logging will go to stdout. (string value)
+# Deprecated group/name - [DEFAULT]/logfile
 #log_file=<None>
 
 # (Optional) The base directory used for relative --log-file
-# paths (string value)
+# paths. (string value)
+# Deprecated group/name - [DEFAULT]/logdir
 #log_dir=<None>
 
-# Use syslog for logging. (boolean value)
+# Use syslog for logging. Existing syslog format is DEPRECATED
+# during I, and will change in J to honor RFC5424. (boolean
+# value)
 #use_syslog=false
 
-# syslog facility to receive log lines (string value)
+# (Optional) Enables or disables syslog rfc5424 format for
+# logging. If enabled, prefixes the MSG part of the syslog
+# message with APP-NAME (RFC5424). The format without the APP-
+# NAME is deprecated in I, and will be removed in J. (boolean
+# value)
+#use_syslog_rfc_format=false
+
+# Syslog facility to receive log lines. (string value)
 #syslog_log_facility=LOG_USER
 
 
@@ -1449,31 +1589,6 @@
 
 
 #
-# Options defined in nova.openstack.common.notifier.api
-#
-
-# Driver or drivers to handle sending notifications (multi
-# valued)
-#notification_driver=
-
-# Default notification level for outgoing notifications
-# (string value)
-#default_notification_level=INFO
-
-# Default publisher_id for outgoing notifications (string
-# value)
-#default_publisher_id=<None>
-
-
-#
-# Options defined in nova.openstack.common.notifier.rpc_notifier
-#
-
-# AMQP topic used for OpenStack notifications (list value)
-#notification_topics=notifications
-
-
-#
 # Options defined in nova.openstack.common.periodic_task
 #
 
@@ -1483,193 +1598,15 @@
 
 
 #
-# Options defined in nova.openstack.common.rpc
-#
-
-# The messaging module to use, defaults to kombu. (string
-# value)
-#rpc_backend=nova.openstack.common.rpc.impl_kombu
-
-# Size of RPC thread pool (integer value)
-#rpc_thread_pool_size=64
-
-# Size of RPC connection pool (integer value)
-#rpc_conn_pool_size=30
-
-# Seconds to wait for a response from call or multicall
-# (integer value)
-#rpc_response_timeout=60
-
-# Seconds to wait before a cast expires (TTL). Only supported
-# by impl_zmq. (integer value)
-#rpc_cast_timeout=30
-
-# Modules of exceptions that are permitted to be recreatedupon
-# receiving exception data from an rpc call. (list value)
-#allowed_rpc_exception_modules=nova.exception,cinder.exception,exceptions
-
-# If passed, use a fake RabbitMQ provider (boolean value)
-#fake_rabbit=false
-
-# AMQP exchange to connect to if using RabbitMQ or Qpid
-# (string value)
-#control_exchange=openstack
-
-
-#
-# Options defined in nova.openstack.common.rpc.amqp
-#
-
-# Use durable queues in amqp. (boolean value)
-#amqp_durable_queues=false
-
-# Auto-delete queues in amqp. (boolean value)
-#amqp_auto_delete=false
-
-
-#
-# Options defined in nova.openstack.common.rpc.impl_kombu
-#
-
-# SSL version to use (valid only if SSL enabled). valid values
-# are TLSv1, SSLv23 and SSLv3. SSLv2 may be available on some
-# distributions (string value)
-#kombu_ssl_version=
-
-# SSL key file (valid only if SSL enabled) (string value)
-#kombu_ssl_keyfile=
-
-# SSL cert file (valid only if SSL enabled) (string value)
-#kombu_ssl_certfile=
-
-# SSL certification authority file (valid only if SSL enabled)
-# (string value)
-#kombu_ssl_ca_certs=
-
-# The RabbitMQ broker address where a single node is used
+# Options defined in nova.openstack.common.policy
+#
+
+# The JSON file that defines policies. (string value)
+#policy_file=policy.json
+
+# Default rule. Enforced when a requested rule is not found.
 # (string value)
-#rabbit_host=localhost
-
-# The RabbitMQ broker port where a single node is used
-# (integer value)
-#rabbit_port=5672
-
-# RabbitMQ HA cluster host:port pairs (list value)
-#rabbit_hosts=$rabbit_host:$rabbit_port
-
-# connect over SSL for RabbitMQ (boolean value)
-#rabbit_use_ssl=false
-
-# the RabbitMQ userid (string value)
-#rabbit_userid=guest
-
-# the RabbitMQ password (string value)
-#rabbit_password=guest
-
-# the RabbitMQ virtual host (string value)
-#rabbit_virtual_host=/
-
-# how frequently to retry connecting with RabbitMQ (integer
-# value)
-#rabbit_retry_interval=1
-
-# how long to backoff for between retries when connecting to
-# RabbitMQ (integer value)
-#rabbit_retry_backoff=2
-
-# maximum retries with trying to connect to RabbitMQ (the
-# default of 0 implies an infinite retry count) (integer
-# value)
-#rabbit_max_retries=0
-
-# use H/A queues in RabbitMQ (x-ha-policy: all).You need to
-# wipe RabbitMQ database when changing this option. (boolean
-# value)
-#rabbit_ha_queues=false
-
-
-#
-# Options defined in nova.openstack.common.rpc.impl_qpid
-#
-
-# Qpid broker hostname (string value)
-#qpid_hostname=localhost
-
-# Qpid broker port (integer value)
-#qpid_port=5672
-
-# Qpid HA cluster host:port pairs (list value)
-#qpid_hosts=$qpid_hostname:$qpid_port
-
-# Username for qpid connection (string value)
-#qpid_username=
-
-# Password for qpid connection (string value)
-#qpid_password=
-
-# Space separated list of SASL mechanisms to use for auth
-# (string value)
-#qpid_sasl_mechanisms=
-
-# Seconds between connection keepalive heartbeats (integer
-# value)
-#qpid_heartbeat=60
-
-# Transport to use, either 'tcp' or 'ssl' (string value)
-#qpid_protocol=tcp
-
-# Disable Nagle algorithm (boolean value)
-#qpid_tcp_nodelay=true
-
-# The qpid topology version to use.  Version 1 is what was
-# originally used by impl_qpid.  Version 2 includes some
-# backwards-incompatible changes that allow broker federation
-# to work.  Users should update to version 2 when they are
-# able to take everything down, as it requires a clean break.
-# (integer value)
-#qpid_topology_version=1
-
-
-#
-# Options defined in nova.openstack.common.rpc.impl_zmq
-#
-
-# ZeroMQ bind address. Should be a wildcard (*), an ethernet
-# interface, or IP. The "host" option should point or resolve
-# to this address. (string value)
-#rpc_zmq_bind_address=*
-
-# MatchMaker driver (string value)
-#rpc_zmq_matchmaker=nova.openstack.common.rpc.matchmaker.MatchMakerLocalhost
-
-# ZeroMQ receiver listening port (integer value)
-#rpc_zmq_port=9501
-
-# Number of ZeroMQ contexts, defaults to 1 (integer value)
-#rpc_zmq_contexts=1
-
-# Maximum number of ingress messages to locally buffer per
-# topic. Default is unlimited. (integer value)
-#rpc_zmq_topic_backlog=<None>
-
-# Directory for holding IPC sockets (string value)
-#rpc_zmq_ipc_dir=/var/run/openstack
-
-# Name of this node. Must be a valid hostname, FQDN, or IP
-# address. Must match "host" option, if running Nova. (string
-# value)
-#rpc_zmq_host=nova
-
-
-#
-# Options defined in nova.openstack.common.rpc.matchmaker
-#
-
-# Heartbeat frequency (integer value)
-#matchmaker_heartbeat_freq=300
-
-# Heartbeat time-to-live. (integer value)
-#matchmaker_heartbeat_ttl=600
+#policy_default_rule=default
 
 
 #
@@ -1703,10 +1640,6 @@
 # The scheduler host manager class to use (string value)
 #scheduler_host_manager=nova.scheduler.host_manager.HostManager
 
-# Maximum number of attempts to schedule an instance (integer
-# value)
-#scheduler_max_attempts=3
-
 
 #
 # Options defined in nova.scheduler.filter_scheduler
@@ -1722,6 +1655,19 @@
 
 
 #
+# Options defined in nova.scheduler.filters.aggregate_image_properties_isolation
+#
+
+# Force the filter to consider only keys matching the given
+# namespace. (string value)
+#aggregate_image_properties_isolation_namespace=<None>
+
+# The separator used between the namespace and keys (string
+# value)
+#aggregate_image_properties_isolation_separator=.
+
+
+#
 # Options defined in nova.scheduler.filters.core_filter
 #
 
@@ -1737,7 +1683,7 @@
 # Options defined in nova.scheduler.filters.disk_filter
 #
 
-# virtual disk to physical disk allocation ratio (floating
+# Virtual disk to physical disk allocation ratio (floating
 # point value)
 #disk_allocation_ratio=1.0
 
@@ -1746,8 +1692,9 @@
 # Options defined in nova.scheduler.filters.io_ops_filter
 #
 
-# Ignore hosts that have too many
-# builds/resizes/snaps/migrations (integer value)
+# Tells filters to ignore hosts that have this many or more
+# instances currently in build, resize, snapshot, migrate,
+# rescue or unshelve task states (integer value)
 #max_io_ops_per_host=8
 
 
@@ -1798,7 +1745,7 @@
 
 # Which filter class names to use for filtering hosts when not
 # specified in the request. (list value)
-#scheduler_default_filters=RetryFilter,AvailabilityZoneFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter
+#scheduler_default_filters=RetryFilter,AvailabilityZoneFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter
 
 # Which weight class names to use for weighing hosts (list
 # value)
@@ -1806,18 +1753,38 @@
 
 
 #
+# Options defined in nova.scheduler.ironic_host_manager
+#
+
+# Which filter class names to use for filtering baremetal
+# hosts when not specified in the request. (list value)
+#baremetal_scheduler_default_filters=RetryFilter,AvailabilityZoneFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ExactRamFilter,ExactDiskFilter,ExactCoreFilter
+
+# Flag to decide whether to use
+# baremetal_scheduler_default_filters or not. (boolean value)
+#scheduler_use_baremetal_filters=false
+
+
+#
 # Options defined in nova.scheduler.manager
 #
 
 # Default driver to use for the scheduler (string value)
 #scheduler_driver=nova.scheduler.filter_scheduler.FilterScheduler
 
+# How often (in seconds) to run periodic tasks in the
+# scheduler driver of your choice. Please note this is likely
+# to interact with the value of service_down_time, but exactly
+# how they interact will depend on your choice of scheduler
+# driver. (integer value)
+#scheduler_driver_task_period=60
+
 
 #
 # Options defined in nova.scheduler.rpcapi
 #
 
-# the topic scheduler nodes listen on (string value)
+# The topic scheduler nodes listen on (string value)
 #scheduler_topic=scheduler
 
 
@@ -1831,6 +1798,15 @@
 
 
 #
+# Options defined in nova.scheduler.utils
+#
+
+# Maximum number of attempts to schedule an instance (integer
+# value)
+#scheduler_max_attempts=3
+
+
+#
 # Options defined in nova.scheduler.weights.ram
 #
 
@@ -1856,8 +1832,8 @@
 # (string value)
 #config_drive_format=iso9660
 
-# Where to put temporary files associated with config drive
-# creation (string value)
+# DEPRECATED (not needed any more):  Where to put temporary
+# files associated with config drive creation (string value)
 #config_drive_tempdir=<None>
 
 # Set to force injection to take place on a config drive (if
@@ -1873,14 +1849,9 @@
 # Options defined in nova.virt.disk.api
 #
 
-# Template file for injected network (string value)
-#injected_network_template=$pybasedir/nova/virt/interfaces.template
-
-# mkfs commands for ephemeral device. The format is
-# <os_type>=<mkfs command> (multi valued)
-#virt_mkfs=default=mkfs.ext3 -L %(fs_label)s -F %(target)s
-#virt_mkfs=linux=mkfs.ext3 -L %(fs_label)s -F %(target)s
-#virt_mkfs=windows=mkfs.ntfs --force --fast --label %(fs_label)s %(target)s
+# Name of the mkfs commands for ephemeral device. The format
+# is <os_type>=<mkfs command> (multi valued)
+#virt_mkfs=
 
 # Attempt to resize the filesystem by accessing the image over
 # a block device. This is done by the host and may not be
@@ -1894,28 +1865,19 @@
 # Options defined in nova.virt.disk.mount.nbd
 #
 
-# time to wait for a NBD device coming up (integer value)
+# Amount of time, in seconds, to wait for NBD device start up.
+# (integer value)
 #timeout_nbd=10
 
 
 #
-# Options defined in nova.virt.docker.driver
-#
-
-# Default TCP port to find the docker-registry container
-# (integer value)
-#docker_registry_default_port=5042
-
-
-#
 # Options defined in nova.virt.driver
 #
 
 # Driver to use for controlling virtualization. Options
 # include: libvirt.LibvirtDriver, xenapi.XenAPIDriver,
 # fake.FakeDriver, baremetal.BareMetalDriver,
-# vmwareapi.VMwareESXDriver, vmwareapi.VMwareVCDriver (string
-# value)
+# vmwareapi.VMwareVCDriver, hyperv.HyperVDriver (string value)
 compute_driver=solariszones.SolarisZonesDriver
 
 # The default format an ephemeral_volume will be formatted
@@ -1930,6 +1892,16 @@
 # Whether to use cow images (boolean value)
 #use_cow_images=true
 
+# Fail instance boot if vif plugging fails (boolean value)
+#vif_plugging_is_fatal=true
+
+# Number of seconds to wait for neutron vif plugging events to
+# arrive before continuing or failing (see
+# vif_plugging_is_fatal). If this is set to zero and
+# vif_plugging_is_fatal is False, events should not be
+# expected to arrive at all. (integer value)
+#vif_plugging_timeout=300
+
 
 #
 # Options defined in nova.virt.firewall
@@ -1945,6 +1917,38 @@
 
 
 #
+# Options defined in nova.virt.hardware
+#
+
+# Defines which pcpus that instance vcpus can use. For
+# example, "4-12,^8,15" (string value)
+#vcpu_pin_set=<None>
+
+
+#
+# Options defined in nova.virt.imagecache
+#
+
+# Number of seconds to wait between runs of the image cache
+# manager. Set to -1 to disable. Setting this to 0 will
+# disable, but this will change in the K release to mean "run
+# at the default rate". (integer value)
+#image_cache_manager_interval=2400
+
+# Where cached images are stored under $instances_path. This
+# is NOT the full path - just a folder name. For per-compute-
+# host cached images, set to _base_$my_ip (string value)
+#image_cache_subdirectory_name=_base
+
+# Should unused base images be removed? (boolean value)
+#remove_unused_base_images=true
+
+# Unused unresized base images younger than this will not be
+# removed (integer value)
+#remove_unused_original_minimum_age_seconds=86400
+
+
+#
 # Options defined in nova.virt.images
 #
 
@@ -1953,512 +1957,36 @@
 
 
 #
-# Options defined in nova.virt.libvirt.driver
-#
-
-# Rescue ami image (string value)
-#rescue_image_id=<None>
-
-# Rescue aki image (string value)
-#rescue_kernel_id=<None>
-
-# Rescue ari image (string value)
-#rescue_ramdisk_id=<None>
-
-# Libvirt domain type (valid options are: kvm, lxc, qemu, uml,
-# xen) (string value)
-#libvirt_type=kvm
-
-# Override the default libvirt URI (which is dependent on
-# libvirt_type) (string value)
-#libvirt_uri=
-
-# Inject the admin password at boot time, without an agent.
-# (boolean value)
-#libvirt_inject_password=false
-
-# Inject the ssh public key at boot time (boolean value)
-#libvirt_inject_key=true
-
-# The partition to inject to : -2 => disable, -1 => inspect
-# (libguestfs only), 0 => not partitioned, >0 => partition
-# number (integer value)
-#libvirt_inject_partition=1
-
-# Sync virtual and real mouse cursors in Windows VMs (boolean
-# value)
-#use_usb_tablet=true
-
-# Migration target URI (any included "%s" is replaced with the
-# migration target hostname) (string value)
-#live_migration_uri=qemu+tcp://%s/system
-
-# Migration flags to be set for live migration (string value)
-#live_migration_flag=VIR_MIGRATE_UNDEFINE_SOURCE, VIR_MIGRATE_PEER2PEER
-
-# Migration flags to be set for block migration (string value)
-#block_migration_flag=VIR_MIGRATE_UNDEFINE_SOURCE, VIR_MIGRATE_PEER2PEER, VIR_MIGRATE_NON_SHARED_INC
-
-# Maximum bandwidth to be used during migration, in Mbps
-# (integer value)
-#live_migration_bandwidth=0
-
-# Snapshot image format (valid options are : raw, qcow2, vmdk,
-# vdi). Defaults to same as source image (string value)
-#snapshot_image_format=<None>
-
-# The libvirt VIF driver to configure the VIFs. (string value)
-#libvirt_vif_driver=nova.virt.libvirt.vif.LibvirtGenericVIFDriver
-
-# Libvirt handlers for remote volumes. (list value)
-#libvirt_volume_drivers=iscsi=nova.virt.libvirt.volume.LibvirtISCSIVolumeDriver,iser=nova.virt.libvirt.volume.LibvirtISERVolumeDriver,local=nova.virt.libvirt.volume.LibvirtVolumeDriver,fake=nova.virt.libvirt.volume.LibvirtFakeVolumeDriver,rbd=nova.virt.libvirt.volume.LibvirtNetVolumeDriver,sheepdog=nova.virt.libvirt.volume.LibvirtNetVolumeDriver,nfs=nova.virt.libvirt.volume.LibvirtNFSVolumeDriver,aoe=nova.virt.libvirt.volume.LibvirtAOEVolumeDriver,glusterfs=nova.virt.libvirt.volume.LibvirtGlusterfsVolumeDriver,fibre_channel=nova.virt.libvirt.volume.LibvirtFibreChannelVolumeDriver,scality=nova.virt.libvirt.volume.LibvirtScalityVolumeDriver
-
-# Override the default disk prefix for the devices attached to
-# a server, which is dependent on libvirt_type. (valid options
-# are: sd, xvd, uvd, vd) (string value)
-#libvirt_disk_prefix=<None>
-
-# Number of seconds to wait for instance to shut down after
-# soft reboot request is made. We fall back to hard reboot if
-# instance does not shutdown within this window. (integer
-# value)
-#libvirt_wait_soft_reboot_seconds=120
-
-# Use a separated OS thread pool to realize non-blocking
-# libvirt calls (boolean value)
-#libvirt_nonblocking=true
-
-# Set to "host-model" to clone the host CPU feature flags; to
-# "host-passthrough" to use the host CPU model exactly; to
-# "custom" to use a named CPU model; to "none" to not set any
-# CPU model. If libvirt_type="kvm|qemu", it will default to
-# "host-model", otherwise it will default to "none" (string
-# value)
-#libvirt_cpu_mode=<None>
-
-# Set to a named libvirt CPU model (see names listed in
-# /usr/share/libvirt/cpu_map.xml). Only has effect if
-# libvirt_cpu_mode="custom" and libvirt_type="kvm|qemu"
-# (string value)
-#libvirt_cpu_model=<None>
-
-# Location where libvirt driver will store snapshots before
-# uploading them to image service (string value)
-#libvirt_snapshots_directory=$instances_path/snapshots
-
-# Location where the Xen hvmloader is kept (string value)
-#xen_hvmloader_path=/usr/lib/xen/boot/hvmloader
-
-# Specific cachemodes to use for different disk types e.g:
-# ["file=directsync","block=none"] (list value)
-#disk_cachemodes=
-
-# Which pcpus can be used by vcpus of instance e.g:
-# "4-12,^8,15" (string value)
-#vcpu_pin_set=<None>
-
-
-#
-# Options defined in nova.virt.libvirt.imagebackend
-#
-
-# VM Images format. Acceptable values are: raw, qcow2,
-# lvm,rbd, default. If default is specified, then
-# use_cow_images flag is used instead of this one. (string
-# value)
-#libvirt_images_type=default
-
-# LVM Volume Group that is used for VM images, when you
-# specify libvirt_images_type=lvm. (string value)
-#libvirt_images_volume_group=<None>
-
-# Create sparse logical volumes (with virtualsize) if this
-# flag is set to True. (boolean value)
-#libvirt_sparse_logical_volumes=false
-
-# The amount of storage (in megabytes) to allocate for LVM
-# snapshot copy-on-write blocks. (integer value)
-#libvirt_lvm_snapshot_size=1000
-
-# the RADOS pool in which rbd volumes are stored (string
-# value)
-#libvirt_images_rbd_pool=rbd
-
-# path to the ceph configuration file to use (string value)
-#libvirt_images_rbd_ceph_conf=
-
-
-#
-# Options defined in nova.virt.libvirt.imagecache
-#
-
-# Where cached images are stored under $instances_path.This is
-# NOT the full path - just a folder name.For per-compute-host
-# cached images, set to _base_$my_ip (string value)
-#base_dir_name=_base
-
-# Allows image information files to be stored in non-standard
-# locations (string value)
-#image_info_filename_pattern=$instances_path/$base_dir_name/%(image)s.info
-
-# Should unused base images be removed? (boolean value)
-#remove_unused_base_images=true
-
-# Should unused kernel images be removed? This is only safe to
-# enable if all compute nodes have been updated to support
-# this option. This will enabled by default in future.
-# (boolean value)
-#remove_unused_kernels=false
-
-# Unused resized base images younger than this will not be
-# removed (integer value)
-#remove_unused_resized_minimum_age_seconds=3600
-
-# Unused unresized base images younger than this will not be
-# removed (integer value)
-#remove_unused_original_minimum_age_seconds=86400
-
-# Write a checksum for files in _base to disk (boolean value)
-#checksum_base_images=false
-
-# How frequently to checksum base images (integer value)
-#checksum_interval_seconds=3600
-
-
-#
-# Options defined in nova.virt.libvirt.utils
-#
-
-# Compress snapshot images when possible. This currently
-# applies exclusively to qcow2 images (boolean value)
-#libvirt_snapshot_compression=false
-
-
-#
-# Options defined in nova.virt.libvirt.vif
-#
-
-# Name of Integration Bridge used by Open vSwitch (string
-# value)
-#libvirt_ovs_bridge=br-int
-
-# Use virtio for bridge interfaces with KVM/QEMU (boolean
-# value)
-#libvirt_use_virtio_for_bridges=true
-
-
-#
-# Options defined in nova.virt.libvirt.volume
-#
-
-# number of times to rescan iSCSI target to find volume
-# (integer value)
-#num_iscsi_scan_tries=3
-
-# number of times to rescan iSER target to find volume
-# (integer value)
-#num_iser_scan_tries=3
-
-# the RADOS client name for accessing rbd volumes (string
-# value)
-#rbd_user=<None>
-
-# the libvirt uuid of the secret for the rbd_uservolumes
-# (string value)
-#rbd_secret_uuid=<None>
-
-# Dir where the nfs volume is mounted on the compute node
-# (string value)
-#nfs_mount_point_base=$state_path/mnt
-
-# Mount options passed to the nfs client. See section of the
-# nfs man page for details (string value)
-#nfs_mount_options=<None>
-
-# number of times to rediscover AoE target to find volume
-# (integer value)
-#num_aoe_discover_tries=3
-
-# Dir where the glusterfs volume is mounted on the compute
-# node (string value)
-#glusterfs_mount_point_base=$state_path/mnt
-
-# use multipath connection of the iSCSI volume (boolean value)
-#libvirt_iscsi_use_multipath=false
-
-# use multipath connection of the iSER volume (boolean value)
-#libvirt_iser_use_multipath=false
-
-# Path or URL to Scality SOFS configuration file (string
+# Options defined in nova.virt.netutils
+#
+
+# Template file for injected network (string value)
+#injected_network_template=$pybasedir/nova/virt/interfaces.template
+
+
+#
+# Options defined in nova.virt.solariszones.driver
+#
+
+# Default path to Glance cache for Solaris Zones. (string
 # value)
-#scality_sofs_config=<None>
-
-# Base dir where Scality SOFS shall be mounted (string value)
-#scality_sofs_mount_point=$state_path/scality
-
-# Protocols listed here will be accessed directly from QEMU.
-# Currently supported protocols: [gluster] (list value)
-#qemu_allowed_storage_drivers=
-
-
-#
-# Options defined in nova.virt.powervm.driver
-#
-
-# PowerVM manager type (ivm, hmc) (string value)
-#powervm_mgr_type=ivm
-
-# PowerVM manager host or ip (string value)
-#powervm_mgr=<None>
-
-# PowerVM manager user name (string value)
-#powervm_mgr_user=<None>
-
-# PowerVM manager user password (string value)
-#powervm_mgr_passwd=<None>
-
-# PowerVM image remote path where images will be moved. Make
-# sure this path can fit your biggest image in glance (string
-# value)
-#powervm_img_remote_path=/home/padmin
-
-# Local directory to download glance images to. Make sure this
-# path can fit your biggest image in glance (string value)
-#powervm_img_local_path=/tmp
-
-
-#
-# Options defined in nova.virt.xenapi.agent
-#
-
-# number of seconds to wait for agent reply (integer value)
-#agent_timeout=30
-
-# number of seconds to wait for agent to be fully operational
-# (integer value)
-#agent_version_timeout=300
-
-# number of seconds to wait for agent reply to resetnetwork
-# request (integer value)
-#agent_resetnetwork_timeout=60
-
-# Specifies the path in which the xenapi guest agent should be
-# located. If the agent is present, network configuration is
-# not injected into the image. Used if
-# compute_driver=xenapi.XenAPIDriver and  flat_injected=True
-# (string value)
-#xenapi_agent_path=usr/sbin/xe-update-networking
-
-# Disables the use of the XenAPI agent in any image regardless
-# of what image properties are present.  (boolean value)
-#xenapi_disable_agent=false
-
-# Determines if the xenapi agent should be used when the image
-# used does not contain a hint to declare if the agent is
-# present or not. The hint is a glance property
-# "xenapi_use_agent" that has the value "true" or "false".
-# Note that waiting for the agent when it is not present will
-# significantly increase server boot times. (boolean value)
-#xenapi_use_agent_default=false
-
-
-#
-# Options defined in nova.virt.xenapi.driver
-#
-
-# URL for connection to XenServer/Xen Cloud Platform. A
-# special value of unix://local can be used to connect to the
-# local unix socket.  Required if
-# compute_driver=xenapi.XenAPIDriver (string value)
-#xenapi_connection_url=<None>
-
-# Username for connection to XenServer/Xen Cloud Platform.
-# Used only if compute_driver=xenapi.XenAPIDriver (string
-# value)
-#xenapi_connection_username=root
-
-# Password for connection to XenServer/Xen Cloud Platform.
-# Used only if compute_driver=xenapi.XenAPIDriver (string
+#glancecache_dirname=$state_path/images
+
+# Location where solariszones driver will store snapshots
+# before uploading them to the Glance image service (string
 # value)
-#xenapi_connection_password=<None>
-
-# Maximum number of concurrent XenAPI connections. Used only
-# if compute_driver=xenapi.XenAPIDriver (integer value)
-#xenapi_connection_concurrent=5
-
-# The interval used for polling of coalescing vhds. Used only
-# if compute_driver=xenapi.XenAPIDriver (floating point value)
-#xenapi_vhd_coalesce_poll_interval=5.0
-
-# Ensure compute service is running on host XenAPI connects
-# to. (boolean value)
-#xenapi_check_host=true
-
-# Max number of times to poll for VHD to coalesce. Used only
-# if compute_driver=xenapi.XenAPIDriver (integer value)
-#xenapi_vhd_coalesce_max_attempts=5
-
-# Base path to the storage repository (string value)
-#xenapi_sr_base_path=/var/run/sr-mount
-
-# iSCSI Target Host (string value)
-#target_host=<None>
-
-# iSCSI Target Port, 3260 Default (string value)
-#target_port=3260
-
-# IQN Prefix (string value)
-#iqn_prefix=iqn.2010-10.org.openstack
-
-# Used to enable the remapping of VBD dev (Works around an
-# issue in Ubuntu Maverick) (boolean value)
-#xenapi_remap_vbd_dev=false
-
-# Specify prefix to remap VBD dev to (ex. /dev/xvdb ->
-# /dev/sdb) (string value)
-#xenapi_remap_vbd_dev_prefix=sd
-
-# Timeout in seconds for XenAPI login. (integer value)
-#xenapi_login_timeout=10
-
-
-#
-# Options defined in nova.virt.xenapi.image.bittorrent
-#
-
-# Base URL for torrent files. (string value)
-#xenapi_torrent_base_url=<None>
-
-# Probability that peer will become a seeder. (1.0 = 100%)
-# (floating point value)
-#xenapi_torrent_seed_chance=1.0
-
-# Number of seconds after downloading an image via BitTorrent
-# that it should be seeded for other peers. (integer value)
-#xenapi_torrent_seed_duration=3600
-
-# Cached torrent files not accessed within this number of
-# seconds can be reaped (integer value)
-#xenapi_torrent_max_last_accessed=86400
-
-# Beginning of port range to listen on (integer value)
-#xenapi_torrent_listen_port_start=6881
-
-# End of port range to listen on (integer value)
-#xenapi_torrent_listen_port_end=6891
-
-# Number of seconds a download can remain at the same progress
-# percentage w/o being considered a stall (integer value)
-#xenapi_torrent_download_stall_cutoff=600
-
-# Maximum number of seeder processes to run concurrently
-# within a given dom0. (-1 = no limit) (integer value)
-#xenapi_torrent_max_seeder_processes_per_host=1
-
-
-#
-# Options defined in nova.virt.xenapi.pool
-#
-
-# To use for hosts with different CPUs (boolean value)
-#use_join_force=true
-
-
-#
-# Options defined in nova.virt.xenapi.vif
-#
-
-# Name of Integration Bridge used by Open vSwitch (string
-# value)
-#xenapi_ovs_integration_bridge=xapi1
-
-
-#
-# Options defined in nova.virt.xenapi.vm_utils
-#
-
-# Cache glance images locally. `all` will cache all images,
-# `some` will only cache images that have the image_property
-# `cache_in_nova=True`, and `none` turns off caching entirely
-# (string value)
-#cache_images=all
-
-# Compression level for images, e.g., 9 for gzip -9. Range is
-# 1-9, 9 being most compressed but most CPU intensive on dom0.
-# (integer value)
-#xenapi_image_compression_level=<None>
-
-# Default OS type (string value)
-#default_os_type=linux
-
-# Time to wait for a block device to be created (integer
-# value)
-#block_device_creation_timeout=10
-
-# Maximum size in bytes of kernel or ramdisk images (integer
-# value)
-#max_kernel_ramdisk_size=16777216
-
-# Filter for finding the SR to be used to install guest
-# instances on. To use the Local Storage in default
-# XenServer/XCP installations set this flag to other-config
-# :i18n-key=local-storage. To select an SR with a different
-# matching criteria, you could set it to other-
-# config:my_favorite_sr=true. On the other hand, to fall back
-# on the Default SR, as displayed by XenCenter, set this flag
-# to: default-sr:true (string value)
-#sr_matching_filter=default-sr:true
-
-# Whether to use sparse_copy for copying data on a resize down
-# (False will use standard dd). This speeds up resizes down
-# considerably since large runs of zeros won't have to be
-# rsynced (boolean value)
-#xenapi_sparse_copy=true
-
-# Maximum number of retries to unplug VBD (integer value)
-#xenapi_num_vbd_unplug_retries=10
-
-# Whether or not to download images via Bit Torrent
-# (all|some|none). (string value)
-#xenapi_torrent_images=none
-
-# Name of network to use for booting iPXE ISOs (string value)
-#xenapi_ipxe_network_name=<None>
-
-# URL to the iPXE boot menu (string value)
-#xenapi_ipxe_boot_menu_url=<None>
-
-# Name and optionally path of the tool used for ISO image
-# creation (string value)
-#xenapi_ipxe_mkisofs_cmd=mkisofs
-
-
-#
-# Options defined in nova.virt.xenapi.vmops
-#
-
-# number of seconds to wait for instance to go to running
-# state (integer value)
-#xenapi_running_timeout=60
-
-# The XenAPI VIF driver using XenServer Network APIs. (string
-# value)
-#xenapi_vif_driver=nova.virt.xenapi.vif.XenAPIBridgeDriver
-
-# Dom0 plugin driver used to handle image uploads. (string
-# value)
-#xenapi_image_upload_handler=nova.virt.xenapi.image.glance.GlanceStore
+#solariszones_snapshots_directory=$instances_path/snapshots
 
 
 #
 # Options defined in nova.vnc
 #
 
-# location of vnc console proxy, in the form
+# Location of VNC console proxy, in the form
 # "http://127.0.0.1:6080/vnc_auto.html" (string value)
-#novncproxy_base_url=http://127.0.0.1:6080/vnc_auto.html
-
-# location of nova xvp vnc console proxy, in the form
+novncproxy_base_url=http://$my_ip:6080/vnc_auto.html
+
+# Location of nova xvp VNC console proxy, in the form
 # "http://127.0.0.1:6081/console" (string value)
 #xvpvncproxy_base_url=http://127.0.0.1:6081/console
 
@@ -2466,14 +1994,14 @@
 # (string value)
 #vncserver_listen=127.0.0.1
 
-# the address to which proxy clients (like nova-xvpvncproxy)
+# The address to which proxy clients (like nova-xvpvncproxy)
 # should connect (string value)
 #vncserver_proxyclient_address=127.0.0.1
 
-# enable vnc related features (boolean value)
+# Enable VNC related features (boolean value)
 #vnc_enabled=true
 
-# keymap for vnc (string value)
+# Keymap for VNC (string value)
 #vnc_keymap=en-us
 
 
@@ -2497,51 +2025,553 @@
 #volume_api_class=nova.volume.cinder.API
 
 
+[baremetal]
+
+#
+# Options defined in nova.virt.baremetal.db.api
+#
+
+# The backend to use for bare-metal database (string value)
+#db_backend=sqlalchemy
+
+
+#
+# Options defined in nova.virt.baremetal.db.sqlalchemy.session
+#
+
+# The SQLAlchemy connection string used to connect to the
+# bare-metal database (string value)
+#sql_connection=sqlite:///$state_path/baremetal_nova.sqlite
+
+
+#
+# Options defined in nova.virt.baremetal.driver
+#
+
+# Baremetal VIF driver. (string value)
+#vif_driver=nova.virt.baremetal.vif_driver.BareMetalVIFDriver
+
+# Baremetal volume driver. (string value)
+#volume_driver=nova.virt.baremetal.volume_driver.LibvirtVolumeDriver
+
+# A list of additional capabilities corresponding to
+# flavor_extra_specs for this compute host to advertise. Valid
+# entries are name=value, pairs For example, "key1:val1,
+# key2:val2" (list value)
+#flavor_extra_specs=
+
+# Baremetal driver back-end (pxe or tilera) (string value)
+#driver=nova.virt.baremetal.pxe.PXE
+
+# Baremetal power management method (string value)
+#power_manager=nova.virt.baremetal.ipmi.IPMI
+
+# Baremetal compute node's tftp root path (string value)
+#tftp_root=/tftpboot
+
+
+#
+# Options defined in nova.virt.baremetal.ipmi
+#
+
+# Path to baremetal terminal program (string value)
+#terminal=shellinaboxd
+
+# Path to baremetal terminal SSL cert(PEM) (string value)
+#terminal_cert_dir=<None>
+
+# Path to directory stores pidfiles of baremetal_terminal
+# (string value)
+#terminal_pid_dir=$state_path/baremetal/console
+
+# Maximal number of retries for IPMI operations (integer
+# value)
+#ipmi_power_retry=10
+
+
+#
+# Options defined in nova.virt.baremetal.pxe
+#
+
+# Default kernel image ID used in deployment phase (string
+# value)
+#deploy_kernel=<None>
+
+# Default ramdisk image ID used in deployment phase (string
+# value)
+#deploy_ramdisk=<None>
+
+# Template file for injected network config (string value)
+#net_config_template=$pybasedir/nova/virt/baremetal/net-dhcp.ubuntu.template
+
+# Additional append parameters for baremetal PXE boot (string
+# value)
+#pxe_append_params=nofb nomodeset vga=normal
+
+# Template file for PXE configuration (string value)
+#pxe_config_template=$pybasedir/nova/virt/baremetal/pxe_config.template
+
+# If True, enable file injection for network info, files and
+# admin password (boolean value)
+#use_file_injection=false
+
+# Timeout for PXE deployments. Default: 0 (unlimited) (integer
+# value)
+#pxe_deploy_timeout=0
+
+# If set, pass the network configuration details to the
+# initramfs via cmdline. (boolean value)
+#pxe_network_config=false
+
+# This gets passed to Neutron as the bootfile dhcp parameter.
+# (string value)
+#pxe_bootfile_name=pxelinux.0
+
+
+#
+# Options defined in nova.virt.baremetal.tilera_pdu
+#
+
+# IP address of tilera pdu (string value)
+#tile_pdu_ip=10.0.100.1
+
+# Management script for tilera pdu (string value)
+#tile_pdu_mgr=/tftpboot/pdu_mgr
+
+# Power status of tilera PDU is OFF (integer value)
+#tile_pdu_off=2
+
+# Power status of tilera PDU is ON (integer value)
+#tile_pdu_on=1
+
+# Power status of tilera PDU (integer value)
+#tile_pdu_status=9
+
+# Wait time in seconds until check the result after tilera
+# power operations (integer value)
+#tile_power_wait=9
+
+
+#
+# Options defined in nova.virt.baremetal.virtual_power_driver
+#
+
+# IP or name to virtual power host (string value)
+#virtual_power_ssh_host=
+
+# Port to use for ssh to virtual power host (integer value)
+#virtual_power_ssh_port=22
+
+# Base command to use for virtual power(vbox, virsh) (string
+# value)
+#virtual_power_type=virsh
+
+# User to execute virtual power commands as (string value)
+#virtual_power_host_user=
+
+# Password for virtual power host_user (string value)
+#virtual_power_host_pass=
+
+# The ssh key for virtual power host_user (string value)
+#virtual_power_host_key=<None>
+
+
+#
+# Options defined in nova.virt.baremetal.volume_driver
+#
+
+# Do not set this out of dev/test environments. If a node does
+# not have a fixed PXE IP address, volumes are exported with
+# globally opened ACL (boolean value)
+#use_unsafe_iscsi=false
+
+# The iSCSI IQN prefix used in baremetal volume connections.
+# (string value)
+#iscsi_iqn_prefix=iqn.2010-10.org.openstack.baremetal
+
+
+[cells]
+
+#
+# Options defined in nova.cells.manager
+#
+
+# Cells communication driver to use (string value)
+#driver=nova.cells.rpc_driver.CellsRPCDriver
+
+# Number of seconds after an instance was updated or deleted
+# to continue to update cells (integer value)
+#instance_updated_at_threshold=3600
+
+# Number of instances to update per periodic task run (integer
+# value)
+#instance_update_num_instances=1
+
+
+#
+# Options defined in nova.cells.messaging
+#
+
+# Maximum number of hops for cells routing. (integer value)
+#max_hop_count=10
+
+# Cells scheduler to use (string value)
+#scheduler=nova.cells.scheduler.CellsScheduler
+
+
+#
+# Options defined in nova.cells.opts
+#
+
+# Enable cell functionality (boolean value)
+#enable=false
+
+# The topic cells nodes listen on (string value)
+#topic=cells
+
+# Manager for cells (string value)
+#manager=nova.cells.manager.CellsManager
+
+# Name of this cell (string value)
+#name=nova
+
+# Key/Multi-value list with the capabilities of the cell (list
+# value)
+#capabilities=hypervisor=xenserver;kvm,os=linux;windows
+
+# Seconds to wait for response from a call to a cell. (integer
+# value)
+#call_timeout=60
+
+# Percentage of cell capacity to hold in reserve. Affects both
+# memory and disk utilization (floating point value)
+#reserve_percent=10.0
+
+# Type of cell: api or compute (string value)
+#cell_type=compute
+
+# Number of seconds after which a lack of capability and
+# capacity updates signals the child cell is to be treated as
+# a mute. (integer value)
+#mute_child_interval=300
+
+# Seconds between bandwidth updates for cells. (integer value)
+#bandwidth_update_interval=600
+
+
+#
+# Options defined in nova.cells.rpc_driver
+#
+
+# Base queue name to use when communicating between cells.
+# Various topics by message type will be appended to this.
+# (string value)
+#rpc_driver_queue_base=cells.intercell
+
+
+#
+# Options defined in nova.cells.scheduler
+#
+
+# Filter classes the cells scheduler should use.  An entry of
+# "nova.cells.filters.all_filters" maps to all cells filters
+# included with nova. (list value)
+#scheduler_filter_classes=nova.cells.filters.all_filters
+
+# Weigher classes the cells scheduler should use.  An entry of
+# "nova.cells.weights.all_weighers" maps to all cell weighers
+# included with nova. (list value)
+#scheduler_weight_classes=nova.cells.weights.all_weighers
+
+# How many retries when no cells are available. (integer
+# value)
+#scheduler_retries=10
+
+# How often to retry in seconds when no cells are available.
+# (integer value)
+#scheduler_retry_delay=2
+
+
+#
+# Options defined in nova.cells.state
+#
+
+# Interval, in seconds, for getting fresh cell information
+# from the database. (integer value)
+#db_check_interval=60
+
+# Configuration file from which to read cells configuration.
+# If given, overrides reading cells from the database. (string
+# value)
+#cells_config=<None>
+
+
+#
+# Options defined in nova.cells.weights.mute_child
+#
+
+# Multiplier used to weigh mute children. (The value should be
+# negative.) (floating point value)
+#mute_weight_multiplier=-10.0
+
+# Weight value assigned to mute children. (The value should be
+# positive.) (floating point value)
+#mute_weight_value=1000.0
+
+
+#
+# Options defined in nova.cells.weights.ram_by_instance_type
+#
+
+# Multiplier used for weighing ram.  Negative numbers mean to
+# stack vs spread. (floating point value)
+#ram_weight_multiplier=10.0
+
+
+#
+# Options defined in nova.cells.weights.weight_offset
+#
+
+# Multiplier used to weigh offset weigher. (floating point
+# value)
+#offset_weight_multiplier=1.0
+
+
+[cinder]
+
 #
 # Options defined in nova.volume.cinder
 #
 
 # Info to match when looking for cinder in the service
-# catalog. Format is : separated values of the form:
+# catalog. Format is: separated values of the form:
 # <service_type>:<service_name>:<endpoint_type> (string value)
-#cinder_catalog_info=volume:cinder:publicURL
+# Deprecated group/name - [DEFAULT]/cinder_catalog_info
+#catalog_info=volume:cinder:publicURL
 
 # Override service catalog lookup with template for cinder
 # endpoint e.g. http://localhost:8776/v1/%(project_id)s
 # (string value)
-#cinder_endpoint_template=<None>
-
-# region name of this node (string value)
+# Deprecated group/name - [DEFAULT]/cinder_endpoint_template
+#endpoint_template=<None>
+
+# Region name of this node (string value)
+# Deprecated group/name - [DEFAULT]/os_region_name
 #os_region_name=<None>
 
 # Location of ca certificates file to use for cinder client
 # requests. (string value)
-#cinder_ca_certificates_file=<None>
+# Deprecated group/name - [DEFAULT]/cinder_ca_certificates_file
+#ca_certificates_file=<None>
 
 # Number of cinderclient retries on failed http calls (integer
 # value)
-#cinder_http_retries=3
+# Deprecated group/name - [DEFAULT]/cinder_http_retries
+#http_retries=3
+
+# HTTP inactivity timeout (in seconds) (integer value)
+# Deprecated group/name - [DEFAULT]/cinder_http_timeout
+#http_timeout=<None>
 
 # Allow to perform insecure SSL requests to cinder (boolean
 # value)
-#cinder_api_insecure=false
+# Deprecated group/name - [DEFAULT]/cinder_api_insecure
+#api_insecure=false
 
 # Allow attach between instance and volume in different
 # availability zones. (boolean value)
-#cinder_cross_az_attach=true
-
-
-#
-# Options defined in nova.virt.solariszones.driver
-#
-
-# Default path to Glance cache for Solaris Zones. (string
+# Deprecated group/name - [DEFAULT]/cinder_cross_az_attach
+#cross_az_attach=true
+
+
+[conductor]
+
+#
+# Options defined in nova.conductor.api
+#
+
+# Perform nova-conductor operations locally (boolean value)
+#use_local=false
+
+# The topic on which conductor nodes listen (string value)
+#topic=conductor
+
+# Full class name for the Manager for conductor (string value)
+#manager=nova.conductor.manager.ConductorManager
+
+# Number of workers for OpenStack Conductor service. The
+# default will be the number of CPUs available. (integer
+# value)
+workers=1
+
+
+[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=mysql://%SERVICE_USER%:%SERVICE_PASSWORD%@localhost/nova
+
+# 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)
-#glancecache_dirname=$state_path/images
-
-# Location where solariszones driver will store snapshots
-# before uploading them to image service (string value)
-#solariszones_snapshots_directory=$instances_path/snapshots
+# 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 db 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
+
+
+[ephemeral_storage_encryption]
+
+#
+# Options defined in nova.compute.api
+#
+
+# Whether to encrypt ephemeral storage (boolean value)
+#enabled=false
+
+# The cipher and mode to be used to encrypt ephemeral storage.
+# Which ciphers are available ciphers depends on kernel
+# support. See /proc/crypto for the list of available options.
+# (string value)
+#cipher=aes-xts-plain64
+
+# The bit length of the encryption key to be used to encrypt
+# ephemeral storage (in XTS mode only half of the bits are
+# used for encryption key) (integer value)
+#key_size=512
+
+
+[glance]
+
+#
+# Options defined in nova.image.glance
+#
+
+# Default glance hostname or IP address (string value)
+# Deprecated group/name - [DEFAULT]/glance_host
+#host=$my_ip
+
+# Default glance port (integer value)
+# Deprecated group/name - [DEFAULT]/glance_port
+#port=9292
+
+# Default protocol to use when connecting to glance. Set to
+# https for SSL. (string value)
+# Deprecated group/name - [DEFAULT]/glance_protocol
+#protocol=http
+
+# A list of the glance api servers available to nova. Prefix
+# with https:// for ssl-based glance api servers.
+# ([hostname|ip]:port) (list value)
+# Deprecated group/name - [DEFAULT]/glance_api_servers
+#api_servers=<None>
+
+# Allow to perform insecure SSL (https) requests to glance
+# (boolean value)
+# Deprecated group/name - [DEFAULT]/glance_api_insecure
+#api_insecure=false
+
+# Number of retries when downloading an image from glance
+# (integer value)
+# Deprecated group/name - [DEFAULT]/glance_num_retries
+#num_retries=0
+
+# A list of url scheme that can be downloaded directly via the
+# direct_url.  Currently supported schemes: [file]. (list
+# value)
+#allowed_direct_url_schemes=
 
 
 [hyperv]
@@ -2590,8 +2620,8 @@
 # value)
 #config_drive_inject_password=false
 
-# qemu-img is used to convert between different image types
-# (string value)
+# Path of qemu-img command which is used to convert between
+# different image types (string value)
 #qemu_img_cmd=qemu-img.exe
 
 # Attaches the Config Drive image as a cdrom drive instead of
@@ -2612,6 +2642,12 @@
 # (floating point value)
 #dynamic_memory_ratio=1.0
 
+# Number of seconds to wait for instance to shut down after
+# soft reboot request is made. We fall back to hard reboot if
+# instance does not shutdown within this window. (integer
+# value)
+#wait_soft_reboot_seconds=60
+
 
 #
 # Options defined in nova.virt.hyperv.volumeops
@@ -2634,65 +2670,56 @@
 #mounted_disk_query_retry_interval=5
 
 
-[zookeeper]
-
-#
-# Options defined in nova.servicegroup.drivers.zk
-#
-
-# The ZooKeeper addresses for servicegroup service in the
-# format of host1:port,host2:port,host3:port (string value)
-#address=<None>
-
-# recv_timeout parameter for the zk session (integer value)
-#recv_timeout=4000
-
-# The prefix used in ZooKeeper to store ephemeral nodes
-# (string value)
-#sg_prefix=/servicegroups
-
-# Number of seconds to wait until retrying to join the session
+[image_file_url]
+
+#
+# Options defined in nova.image.download.file
+#
+
+# List of file systems that are configured in this file in the
+# image_file_url:<list entry name> sections (list value)
+#filesystems=
+
+
+[ironic]
+
+#
+# Options defined in nova.virt.ironic.driver
+#
+
+# Version of Ironic API service endpoint. (integer value)
+#api_version=1
+
+# URL for Ironic API endpoint. (string value)
+#api_endpoint=<None>
+
+# Ironic keystone admin name (string value)
+#admin_username=<None>
+
+# Ironic keystone admin password. (string value)
+#admin_password=<None>
+
+# Ironic keystone auth token. (string value)
+#admin_auth_token=<None>
+
+# Keystone public API endpoint. (string value)
+#admin_url=<None>
+
+# Log level override for ironicclient. Set this in order to
+# override the global "default_log_levels", "verbose", and
+# "debug" settings. (string value)
+#client_log_level=<None>
+
+# Ironic keystone tenant name. (string value)
+#admin_tenant_name=<None>
+
+# How many retries when a request does conflict. (integer
+# value)
+#api_max_retries=60
+
+# How often to retry in seconds when a request does conflict
 # (integer value)
-#sg_retry_interval=5
-
-
-[osapi_v3]
-
-#
-# Options defined in nova.api.openstack
-#
-
-# Whether the V3 API is enabled or not (boolean value)
-#enabled=false
-
-# A list of v3 API extensions to never load. Specify the
-# extension aliases here. (list value)
-#extensions_blacklist=
-
-# If the list is not empty then a v3 API extension will only
-# be loaded if it exists in this list. Specify the extension
-# aliases here. (list value)
-#extensions_whitelist=
-
-
-[conductor]
-
-#
-# Options defined in nova.conductor.api
-#
-
-# Perform nova-conductor operations locally (boolean value)
-#use_local=false
-
-# the topic conductor nodes listen on (string value)
-#topic=conductor
-
-# full class name for the Manager for conductor (string value)
-#manager=nova.conductor.manager.ConductorManager
-
-# Number of workers for OpenStack Conductor service (integer
-# value)
-#workers=<None>
+#api_retry_interval=2
 
 
 [keymgr]
@@ -2715,421 +2742,782 @@
 #fixed_key=<None>
 
 
-[cells]
-
-#
-# Options defined in nova.cells.manager
-#
-
-# Cells communication driver to use (string value)
-#driver=nova.cells.rpc_driver.CellsRPCDriver
-
-# Number of seconds after an instance was updated or deleted
-# to continue to update cells (integer value)
-#instance_updated_at_threshold=3600
-
-# Number of instances to update per periodic task run (integer
+[keystone_authtoken]
+
+#
+# Options defined in keystonemiddleware.auth_token
+#
+
+# Complete public Identity API endpoint. (string value)
+auth_uri=http://127.0.0.1:5000/v2.0/
+
+# API version of the admin Identity API endpoint. (string
 # value)
-#instance_update_num_instances=1
-
-
-#
-# Options defined in nova.cells.messaging
-#
-
-# Maximum number of hops for cells routing. (integer value)
-#max_hop_count=10
-
-# Cells scheduler to use (string value)
-#scheduler=nova.cells.scheduler.CellsScheduler
-
-
-#
-# Options defined in nova.cells.opts
-#
-
-# Enable cell functionality (boolean value)
-#enable=false
-
-# the topic cells nodes listen on (string value)
-#topic=cells
-
-# Manager for cells (string value)
-#manager=nova.cells.manager.CellsManager
-
-# name of this cell (string value)
-#name=nova
-
-# Key/Multi-value list with the capabilities of the cell (list
-# value)
-#capabilities=hypervisor=xenserver;kvm,os=linux;windows
-
-# Seconds to wait for response from a call to a cell. (integer
-# value)
-#call_timeout=60
-
-# Percentage of cell capacity to hold in reserve. Affects both
-# memory and disk utilization (floating point value)
-#reserve_percent=10.0
-
-# Type of cell: api or compute (string value)
-#cell_type=<None>
-
-# Number of seconds after which a lack of capability and
-# capacity updates signals the child cell is to be treated as
-# a mute. (integer value)
-#mute_child_interval=300
-
-# Seconds between bandwidth updates for cells. (integer value)
-#bandwidth_update_interval=600
-
-
-#
-# Options defined in nova.cells.rpc_driver
-#
-
-# Base queue name to use when communicating between cells.
-# Various topics by message type will be appended to this.
+#auth_version=<None>
+
+# Do not handle authorization requests within the middleware,
+# but delegate the authorization decision to downstream WSGI
+# components. (boolean value)
+#delay_auth_decision=false
+
+# Request timeout value for communicating with Identity API
+# server. (integer value)
+#http_connect_timeout=<None>
+
+# How many times are we trying to reconnect when communicating
+# with Identity API Server. (integer value)
+#http_request_max_retries=3
+
+# Env key for the swift cache. (string value)
+#cache=<None>
+
+# Required if identity server requires client certificate
+# (string value)
+#certfile=<None>
+
+# Required if identity server requires client certificate
 # (string value)
-#rpc_driver_queue_base=cells.intercell
-
-
-#
-# Options defined in nova.cells.scheduler
-#
-
-# Filter classes the cells scheduler should use.  An entry of
-# "nova.cells.filters.all_filters"maps to all cells filters
-# included with nova. (list value)
-#scheduler_filter_classes=nova.cells.filters.all_filters
-
-# Weigher classes the cells scheduler should use.  An entry of
-# "nova.cells.weights.all_weighers"maps to all cell weighers
-# included with nova. (list value)
-#scheduler_weight_classes=nova.cells.weights.all_weighers
-
-# How many retries when no cells are available. (integer
+#keyfile=<None>
+
+# A PEM encoded Certificate Authority to use when verifying
+# HTTPs connections. Defaults to system CAs. (string value)
+#cafile=<None>
+
+# Verify HTTPS connections. (boolean value)
+#insecure=false
+
+# Directory used to cache files related to PKI tokens. (string
+# value)
+signing_dir=$state_path/keystone-signing
+
+# Optionally specify a list of memcached server(s) to use for
+# caching. If left undefined, tokens will instead be cached
+# in-process. (list value)
+# Deprecated group/name - [DEFAULT]/memcache_servers
+#memcached_servers=<None>
+
+# In order to prevent excessive effort spent validating
+# tokens, the middleware caches previously-seen tokens for a
+# configurable duration (in seconds). Set to -1 to disable
+# caching completely. (integer value)
+#token_cache_time=300
+
+# Determines the frequency at which the list of revoked tokens
+# is retrieved from the Identity service (in seconds). A high
+# number of revocation events combined with a low cache
+# duration may significantly reduce performance. (integer
 # value)
-#scheduler_retries=10
-
-# How often to retry in seconds when no cells are available.
-# (integer value)
-#scheduler_retry_delay=2
-
-
-#
-# Options defined in nova.cells.state
-#
-
-# Seconds between getting fresh cell info from db. (integer
+#revocation_cache_time=10
+
+# (Optional) If defined, indicate whether token data should be
+# authenticated or authenticated and encrypted. Acceptable
+# values are MAC or ENCRYPT.  If MAC, token data is
+# authenticated (with HMAC) in the cache. If ENCRYPT, token
+# data is encrypted and authenticated in the cache. If the
+# value is not one of these options or empty, auth_token will
+# raise an exception on initialization. (string value)
+#memcache_security_strategy=<None>
+
+# (Optional, mandatory if memcache_security_strategy is
+# defined) This string is used for key derivation. (string
 # value)
-#db_check_interval=60
-
-# Configuration file from which to read cells configuration.
-# If given, overrides reading cells from the database. (string
+#memcache_secret_key=<None>
+
+# (Optional) Number of seconds memcached server is considered
+# dead before it is tried again. (integer value)
+#memcache_pool_dead_retry=300
+
+# (Optional) Maximum total number of open connections to every
+# memcached server. (integer value)
+#memcache_pool_maxsize=10
+
+# (Optional) Socket timeout in seconds for communicating with
+# a memcache server. (integer value)
+#memcache_pool_socket_timeout=3
+
+# (Optional) Number of seconds a connection to memcached is
+# held unused in the pool before it is closed. (integer value)
+#memcache_pool_unused_timeout=60
+
+# (Optional) Number of seconds that an operation will wait to
+# get a memcache client connection from the pool. (integer
+# value)
+#memcache_pool_conn_get_timeout=10
+
+# (Optional) Use the advanced (eventlet safe) memcache client
+# pool. The advanced pool will only work under python 2.x.
+# (boolean value)
+#memcache_use_advanced_pool=false
+
+# (Optional) Indicate whether to set the X-Service-Catalog
+# header. If False, middleware will not ask for service
+# catalog on token validation and will not set the X-Service-
+# Catalog header. (boolean value)
+#include_service_catalog=true
+
+# Used to control the use and type of token binding. Can be
+# set to: "disabled" to not check token binding. "permissive"
+# (default) to validate binding information if the bind type
+# is of a form known to the server and ignore it if not.
+# "strict" like "permissive" but if the bind type is unknown
+# the token will be rejected. "required" any form of token
+# binding is needed to be allowed. Finally the name of a
+# binding method that must be present in tokens. (string
 # value)
-#cells_config=<None>
-
-
-#
-# Options defined in nova.cells.weights.mute_child
-#
-
-# Multiplier used to weigh mute children.  (The value should
-# be negative.) (floating point value)
-#mute_weight_multiplier=-10.0
-
-# Weight value assigned to mute children.  (The value should
-# be positive.) (floating point value)
-#mute_weight_value=1000.0
-
-
-#
-# Options defined in nova.cells.weights.ram_by_instance_type
-#
-
-# Multiplier used for weighing ram.  Negative numbers mean to
-# stack vs spread. (floating point value)
-#ram_weight_multiplier=10.0
-
-
-[database]
-
-#
-# Options defined in nova.openstack.common.db.api
-#
-
-# The backend to use for db (string value)
-#backend=sqlalchemy
-
-# Enable the experimental use of thread pooling for all DB API
-# calls (boolean value)
-#use_tpool=false
-
-
-#
-# Options defined in nova.openstack.common.db.sqlalchemy.session
-#
-
-# The SQLAlchemy connection string used to connect to the
-# database (string value)
-#connection=sqlite:///$state_path/$sqlite_db
-
-# The SQLAlchemy connection string used to connect to the
-# slave database (string value)
-#slave_connection=
-
-# timeout before idle sql connections are reaped (integer
+#enforce_token_bind=permissive
+
+# If true, the revocation list will be checked for cached
+# tokens. This requires that PKI tokens are configured on the
+# identity server. (boolean value)
+#check_revocations_for_cached=false
+
+# Hash algorithms to use for hashing PKI tokens. This may be a
+# single algorithm or multiple. The algorithms are those
+# supported by Python standard hashlib.new(). The hashes will
+# be tried in the order given, so put the preferred one first
+# for performance. The result of the first hash will be stored
+# in the cache. This will typically be set to multiple values
+# only while migrating from a less secure algorithm to a more
+# secure one. Once all the old tokens are expired this option
+# should be set to a single value for better performance.
+# (list value)
+#hash_algorithms=md5
+
+# Prefix to prepend at the beginning of the path. Deprecated,
+# use identity_uri. (string value)
+#auth_admin_prefix=
+
+# Host providing the admin Identity API endpoint. Deprecated,
+# use identity_uri. (string value)
+#auth_host=127.0.0.1
+
+# Port of the admin Identity API endpoint. Deprecated, use
+# identity_uri. (integer value)
+#auth_port=35357
+
+# Protocol of the admin Identity API endpoint (http or https).
+# Deprecated, use identity_uri. (string value)
+#auth_protocol=https
+
+# Complete admin Identity API endpoint. This should specify
+# the unversioned root endpoint e.g. https://localhost:35357/
+# (string value)
+identity_uri=http://127.0.0.1:35357/
+
+# This option is deprecated and may be removed in a future
+# release. Single shared secret with the Keystone
+# configuration used for bootstrapping a Keystone
+# installation, or otherwise bypassing the normal
+# authentication process. This option should not be used, use
+# `admin_user` and `admin_password` instead. (string value)
+#admin_token=<None>
+
+# Service username. (string value)
+admin_user=%SERVICE_USER%
+
+# Service user password. (string value)
+admin_password=%SERVICE_PASSWORD%
+
+# Service tenant name. (string value)
+admin_tenant_name=%SERVICE_TENANT_NAME%
+
+
+[libvirt]
+
+#
+# Options defined in nova.virt.libvirt.driver
+#
+
+# Rescue ami image. This will not be used if an image id is
+# provided by the user. (string value)
+#rescue_image_id=<None>
+
+# Rescue aki image (string value)
+#rescue_kernel_id=<None>
+
+# Rescue ari image (string value)
+#rescue_ramdisk_id=<None>
+
+# Libvirt domain type (valid options are: kvm, lxc, qemu, uml,
+# xen) (string value)
+#virt_type=kvm
+
+# Override the default libvirt URI (which is dependent on
+# virt_type) (string value)
+#connection_uri=
+
+# Inject the admin password at boot time, without an agent.
+# (boolean value)
+#inject_password=false
+
+# Inject the ssh public key at boot time (boolean value)
+#inject_key=false
+
+# The partition to inject to : -2 => disable, -1 => inspect
+# (libguestfs only), 0 => not partitioned, >0 => partition
+# number (integer value)
+#inject_partition=-2
+
+# Sync virtual and real mouse cursors in Windows VMs (boolean
 # value)
-#idle_timeout=3600
-
-# Minimum number of SQL connections to keep open in a pool
-# (integer value)
-#min_pool_size=1
-
-# Maximum number of SQL connections to keep open in a pool
-# (integer value)
-#max_pool_size=<None>
-
-# maximum db connection retries during startup. (setting -1
-# implies an infinite retry count) (integer value)
-#max_retries=10
-
-# interval between retries of opening a sql connection
-# (integer value)
-#retry_interval=10
-
-# If set, use this value for max_overflow with sqlalchemy
+#use_usb_tablet=true
+
+# Migration target URI (any included "%s" is replaced with the
+# migration target hostname) (string value)
+#live_migration_uri=qemu+tcp://%s/system
+
+# Migration flags to be set for live migration (string value)
+#live_migration_flag=VIR_MIGRATE_UNDEFINE_SOURCE, VIR_MIGRATE_PEER2PEER, VIR_MIGRATE_LIVE, VIR_MIGRATE_TUNNELLED
+
+# Migration flags to be set for block migration (string value)
+#block_migration_flag=VIR_MIGRATE_UNDEFINE_SOURCE, VIR_MIGRATE_PEER2PEER, VIR_MIGRATE_LIVE, VIR_MIGRATE_TUNNELLED, VIR_MIGRATE_NON_SHARED_INC
+
+# Maximum bandwidth to be used during migration, in Mbps
 # (integer value)
-#max_overflow=<None>
-
-# Verbosity of SQL debugging information. 0=None,
-# 100=Everything (integer value)
-#connection_debug=0
-
-# Add python stack traces to SQL as comment strings (boolean
+#live_migration_bandwidth=0
+
+# Snapshot image format (valid options are : raw, qcow2, vmdk,
+# vdi). Defaults to same as source image (string value)
+#snapshot_image_format=<None>
+
+# DEPRECATED. Libvirt handlers for remote volumes. This option
+# is deprecated and will be removed in the Kilo release. (list
 # value)
-#connection_trace=false
-
-# If set, use this value for pool_timeout with sqlalchemy
-# (integer value)
-#pool_timeout=<None>
-
-
-[image_file_url]
-
-#
-# Options defined in nova.image.download.file
-#
-
-# A list of filesystems that will be configured in this file
-# under the sections image_file_url:<list entry name> (list
+#volume_drivers=iscsi=nova.virt.libvirt.volume.LibvirtISCSIVolumeDriver,iser=nova.virt.libvirt.volume.LibvirtISERVolumeDriver,local=nova.virt.libvirt.volume.LibvirtVolumeDriver,fake=nova.virt.libvirt.volume.LibvirtFakeVolumeDriver,rbd=nova.virt.libvirt.volume.LibvirtNetVolumeDriver,sheepdog=nova.virt.libvirt.volume.LibvirtNetVolumeDriver,nfs=nova.virt.libvirt.volume.LibvirtNFSVolumeDriver,aoe=nova.virt.libvirt.volume.LibvirtAOEVolumeDriver,glusterfs=nova.virt.libvirt.volume.LibvirtGlusterfsVolumeDriver,fibre_channel=nova.virt.libvirt.volume.LibvirtFibreChannelVolumeDriver,scality=nova.virt.libvirt.volume.LibvirtScalityVolumeDriver,gpfs=nova.virt.libvirt.volume.LibvirtGPFSVolumeDriver
+
+# Override the default disk prefix for the devices attached to
+# a server, which is dependent on virt_type. (valid options
+# are: sd, xvd, uvd, vd) (string value)
+#disk_prefix=<None>
+
+# Number of seconds to wait for instance to shut down after
+# soft reboot request is made. We fall back to hard reboot if
+# instance does not shutdown within this window. (integer
+# value)
+#wait_soft_reboot_seconds=120
+
+# Set to "host-model" to clone the host CPU feature flags; to
+# "host-passthrough" to use the host CPU model exactly; to
+# "custom" to use a named CPU model; to "none" to not set any
+# CPU model. If virt_type="kvm|qemu", it will default to
+# "host-model", otherwise it will default to "none" (string
 # value)
-#filesystems=
-
-
-[baremetal]
-
-#
-# Options defined in nova.virt.baremetal.db.api
-#
-
-# The backend to use for bare-metal database (string value)
-#db_backend=sqlalchemy
-
-
-#
-# Options defined in nova.virt.baremetal.db.sqlalchemy.session
-#
-
-# The SQLAlchemy connection string used to connect to the
-# bare-metal database (string value)
-#sql_connection=sqlite:///$state_path/baremetal_$sqlite_db
-
-
-#
-# Options defined in nova.virt.baremetal.driver
-#
-
-# Baremetal VIF driver. (string value)
-#vif_driver=nova.virt.baremetal.vif_driver.BareMetalVIFDriver
-
-# Baremetal volume driver. (string value)
-#volume_driver=nova.virt.baremetal.volume_driver.LibvirtVolumeDriver
-
-# a list of additional capabilities corresponding to
-# instance_type_extra_specs for this compute host to
-# advertise. Valid entries are name=value, pairs For example,
-# "key1:val1, key2:val2" (list value)
-#instance_type_extra_specs=
-
-# Baremetal driver back-end (pxe or tilera) (string value)
-#driver=nova.virt.baremetal.pxe.PXE
-
-# Baremetal power management method (string value)
-#power_manager=nova.virt.baremetal.ipmi.IPMI
-
-# Baremetal compute node's tftp root path (string value)
-#tftp_root=/tftpboot
-
-
-#
-# Options defined in nova.virt.baremetal.ipmi
-#
-
-# path to baremetal terminal program (string value)
-#terminal=shellinaboxd
-
-# path to baremetal terminal SSL cert(PEM) (string value)
-#terminal_cert_dir=<None>
-
-# path to directory stores pidfiles of baremetal_terminal
+#cpu_mode=<None>
+
+# Set to a named libvirt CPU model (see names listed in
+# /usr/share/libvirt/cpu_map.xml). Only has effect if
+# cpu_mode="custom" and virt_type="kvm|qemu" (string value)
+#cpu_model=<None>
+
+# Location where libvirt driver will store snapshots before
+# uploading them to image service (string value)
+#snapshots_directory=$instances_path/snapshots
+
+# Location where the Xen hvmloader is kept (string value)
+#xen_hvmloader_path=/usr/lib/xen/boot/hvmloader
+
+# Specific cachemodes to use for different disk types e.g:
+# file=directsync,block=none (list value)
+#disk_cachemodes=
+
+# A path to a device that will be used as source of entropy on
+# the host. Permitted options are: /dev/random or /dev/hwrng
 # (string value)
-#terminal_pid_dir=$state_path/baremetal/console
-
-# maximal number of retries for IPMI operations (integer
+#rng_dev_path=<None>
+
+# For qemu or KVM guests, set this option to specify a default
+# machine type per host architecture. You can find a list of
+# supported machine types in your environment by checking the
+# output of the "virsh capabilities"command. The format of the
+# value for this config option is host-arch=machine-type. For
+# example: x86_64=machinetype1,armv7l=machinetype2 (list
 # value)
-#ipmi_power_retry=10
-
-
-#
-# Options defined in nova.virt.baremetal.pxe
-#
-
-# Default kernel image ID used in deployment phase (string
+#hw_machine_type=<None>
+
+# The data source used to the populate the host "serial" UUID
+# exposed to guest in the virtual BIOS. Permitted options are
+# "hardware", "os", "none" or "auto" (default). (string value)
+#sysinfo_serial=auto
+
+# A number of seconds to memory usage statistics period. Zero
+# or negative value mean to disable memory usage statistics.
+# (integer value)
+#mem_stats_period_seconds=10
+
+# List of uid targets and ranges.Syntax is guest-uid:host-
+# uid:countMaximum of 5 allowed. (list value)
+#uid_maps=
+
+# List of guid targets and ranges.Syntax is guest-gid:host-
+# gid:countMaximum of 5 allowed. (list value)
+#gid_maps=
+
+
+#
+# Options defined in nova.virt.libvirt.imagebackend
+#
+
+# VM Images format. Acceptable values are: raw, qcow2, lvm,
+# rbd, default. If default is specified, then use_cow_images
+# flag is used instead of this one. (string value)
+#images_type=default
+
+# LVM Volume Group that is used for VM images, when you
+# specify images_type=lvm. (string value)
+#images_volume_group=<None>
+
+# Create sparse logical volumes (with virtualsize) if this
+# flag is set to True. (boolean value)
+#sparse_logical_volumes=false
+
+# Method used to wipe old volumes (valid options are: none,
+# zero, shred) (string value)
+#volume_clear=zero
+
+# Size in MiB to wipe at start of old volumes. 0 => all
+# (integer value)
+#volume_clear_size=0
+
+# The RADOS pool in which rbd volumes are stored (string
 # value)
-#deploy_kernel=<None>
-
-# Default ramdisk image ID used in deployment phase (string
-# value)
-#deploy_ramdisk=<None>
-
-# Template file for injected network config (string value)
-#net_config_template=$pybasedir/nova/virt/baremetal/net-dhcp.ubuntu.template
-
-# additional append parameters for baremetal PXE boot (string
-# value)
-#pxe_append_params=nofb nomodeset vga=normal
-
-# Template file for PXE configuration (string value)
-#pxe_config_template=$pybasedir/nova/virt/baremetal/pxe_config.template
-
-# Timeout for PXE deployments. Default: 0 (unlimited) (integer
+#images_rbd_pool=rbd
+
+# Path to the ceph configuration file to use (string value)
+#images_rbd_ceph_conf=
+
+# Discard option for nova managed disks (valid options are:
+# ignore, unmap). Need Libvirt(1.0.6) Qemu1.5 (raw format)
+# Qemu1.6(qcow2 format) (string value)
+#hw_disk_discard=<None>
+
+
+#
+# Options defined in nova.virt.libvirt.imagecache
+#
+
+# Allows image information files to be stored in non-standard
+# locations (string value)
+#image_info_filename_pattern=$instances_path/$image_cache_subdirectory_name/%(image)s.info
+
+# Should unused kernel images be removed? This is only safe to
+# enable if all compute nodes have been updated to support
+# this option. This will be enabled by default in future.
+# (boolean value)
+#remove_unused_kernels=false
+
+# Unused resized base images younger than this will not be
+# removed (integer value)
+#remove_unused_resized_minimum_age_seconds=3600
+
+# Write a checksum for files in _base to disk (boolean value)
+#checksum_base_images=false
+
+# How frequently to checksum base images (integer value)
+#checksum_interval_seconds=3600
+
+
+#
+# Options defined in nova.virt.libvirt.utils
+#
+
+# Compress snapshot images when possible. This currently
+# applies exclusively to qcow2 images (boolean value)
+#snapshot_compression=false
+
+
+#
+# Options defined in nova.virt.libvirt.vif
+#
+
+# Use virtio for bridge interfaces with KVM/QEMU (boolean
 # value)
-#pxe_deploy_timeout=0
-
-# If set, pass the network configuration details to the
-# initramfs via cmdline. (boolean value)
-#pxe_network_config=false
-
-# This gets passed to Neutron as the bootfile dhcp parameter
-# when the dhcp_options_enabled is set. (string value)
-#pxe_bootfile_name=pxelinux.0
-
-
-#
-# Options defined in nova.virt.baremetal.tilera_pdu
-#
-
-# ip address of tilera pdu (string value)
-#tile_pdu_ip=10.0.100.1
-
-# management script for tilera pdu (string value)
-#tile_pdu_mgr=/tftpboot/pdu_mgr
-
-# power status of tilera PDU is OFF (integer value)
-#tile_pdu_off=2
-
-# power status of tilera PDU is ON (integer value)
-#tile_pdu_on=1
-
-# power status of tilera PDU (integer value)
-#tile_pdu_status=9
-
-# wait time in seconds until check the result after tilera
-# power operations (integer value)
-#tile_power_wait=9
-
-
-#
-# Options defined in nova.virt.baremetal.virtual_power_driver
-#
-
-# ip or name to virtual power host (string value)
-#virtual_power_ssh_host=
-
-# Port to use for ssh to virtual power host (integer value)
-#virtual_power_ssh_port=22
-
-# base command to use for virtual power(vbox,virsh) (string
+#use_virtio_for_bridges=true
+
+
+#
+# Options defined in nova.virt.libvirt.volume
+#
+
+# Number of times to rescan iSCSI target to find volume
+# (integer value)
+#num_iscsi_scan_tries=5
+
+# Number of times to rescan iSER target to find volume
+# (integer value)
+#num_iser_scan_tries=5
+
+# The RADOS client name for accessing rbd volumes (string
 # value)
-#virtual_power_type=virsh
-
-# user to execute virtual power commands as (string value)
-#virtual_power_host_user=
-
-# password for virtual power host_user (string value)
-#virtual_power_host_pass=
-
-# ssh key for virtual power host_user (string value)
-#virtual_power_host_key=<None>
-
-
-#
-# Options defined in nova.virt.baremetal.volume_driver
-#
-
-# Do not set this out of dev/test environments. If a node does
-# not have a fixed PXE IP address, volumes are exported with
-# globally opened ACL (boolean value)
-#use_unsafe_iscsi=false
-
-# iSCSI IQN prefix used in baremetal volume connections.
+#rbd_user=<None>
+
+# The libvirt UUID of the secret for the rbd_uservolumes
 # (string value)
-#iscsi_iqn_prefix=iqn.2010-10.org.openstack.baremetal
-
-
-[rpc_notifier2]
-
-#
-# Options defined in nova.openstack.common.notifier.rpc_notifier2
-#
-
-# AMQP topic(s) used for OpenStack notifications (list value)
-#topics=notifications
+#rbd_secret_uuid=<None>
+
+# Directory where the NFS volume is mounted on the compute
+# node (string value)
+#nfs_mount_point_base=$state_path/mnt
+
+# Mount options passedf to the NFS client. See section of the
+# nfs man page for details (string value)
+#nfs_mount_options=<None>
+
+# Number of times to rediscover AoE target to find volume
+# (integer value)
+#num_aoe_discover_tries=3
+
+# Directory where the glusterfs volume is mounted on the
+# compute node (string value)
+#glusterfs_mount_point_base=$state_path/mnt
+
+# Use multipath connection of the iSCSI volume (boolean value)
+#iscsi_use_multipath=false
+
+# Use multipath connection of the iSER volume (boolean value)
+#iser_use_multipath=false
+
+# Path or URL to Scality SOFS configuration file (string
+# value)
+#scality_sofs_config=<None>
+
+# Base dir where Scality SOFS shall be mounted (string value)
+#scality_sofs_mount_point=$state_path/scality
+
+# Protocols listed here will be accessed directly from QEMU.
+# Currently supported protocols: [gluster] (list value)
+#qemu_allowed_storage_drivers=
 
 
 [matchmaker_redis]
 
 #
-# Options defined in nova.openstack.common.rpc.matchmaker_redis
-#
-
-# Host to locate redis (string value)
+# Options defined in oslo.messaging
+#
+
+# Host to locate redis. (string value)
 #host=127.0.0.1
 
 # Use this port to connect to redis host. (integer value)
 #port=6379
 
-# Password for Redis server. (optional) (string value)
+# Password for Redis server (optional). (string value)
 #password=<None>
 
 
+[matchmaker_ring]
+
+#
+# Options defined in oslo.messaging
+#
+
+# Matchmaker ring file (JSON). (string value)
+# Deprecated group/name - [DEFAULT]/matchmaker_ringfile
+#ringfile=/etc/oslo/matchmaker_ring.json
+
+
+[metrics]
+
+#
+# Options defined in nova.scheduler.weights.metrics
+#
+
+# Multiplier used for weighing metrics. (floating point value)
+#weight_multiplier=1.0
+
+# How the metrics are going to be weighed. This should be in
+# the form of "<name1>=<ratio1>, <name2>=<ratio2>, ...", where
+# <nameX> is one of the metrics to be weighed, and <ratioX> is
+# the corresponding ratio. So for "name1=1.0, name2=-1.0" The
+# final weight would be name1.value * 1.0 + name2.value *
+# -1.0. (list value)
+#weight_setting=
+
+# How to treat the unavailable metrics. When a metric is NOT
+# available for a host, if it is set to be True, it would
+# raise an exception, so it is recommended to use the
+# scheduler filter MetricFilter to filter out those hosts. If
+# it is set to be False, the unavailable metric would be
+# treated as a negative factor in weighing process, the
+# returned value would be set by the option
+# weight_of_unavailable. (boolean value)
+#required=true
+
+# The final weight value to be returned if required is set to
+# False and any one of the metrics set by weight_setting is
+# unavailable. (floating point value)
+#weight_of_unavailable=-10000.0
+
+
+[neutron]
+
+#
+# Options defined in nova.api.metadata.handler
+#
+
+# Set flag to indicate Neutron will proxy metadata requests
+# and resolve instance ids. (boolean value)
+# Deprecated group/name - [DEFAULT]/service_neutron_metadata_proxy
+service_metadata_proxy=true
+
+# Shared secret to validate proxies Neutron metadata requests
+# (string value)
+# Deprecated group/name - [DEFAULT]/neutron_metadata_proxy_shared_secret
+#metadata_proxy_shared_secret=
+
+
+#
+# Options defined in nova.network.neutronv2.api
+#
+
+# URL for connecting to neutron (string value)
+# Deprecated group/name - [DEFAULT]/neutron_url
+#url=http://127.0.0.1:9696
+
+# Timeout value for connecting to neutron in seconds (integer
+# value)
+# Deprecated group/name - [DEFAULT]/neutron_url_timeout
+#url_timeout=30
+
+# User id for connecting to neutron in admin context (string
+# value)
+#admin_user_id=<None>
+
+# Username for connecting to neutron in admin context (string
+# value)
+# Deprecated group/name - [DEFAULT]/neutron_admin_username
+#admin_username=<None>
+
+# Password for connecting to neutron in admin context (string
+# value)
+# Deprecated group/name - [DEFAULT]/neutron_admin_password
+#admin_password=<None>
+
+# Tenant id for connecting to neutron in admin context (string
+# value)
+# Deprecated group/name - [DEFAULT]/neutron_admin_tenant_id
+#admin_tenant_id=<None>
+
+# Tenant name for connecting to neutron in admin context. This
+# option will be ignored if neutron_admin_tenant_id is set.
+# Note that with Keystone V3 tenant names are only unique
+# within a domain. (string value)
+# Deprecated group/name - [DEFAULT]/neutron_admin_tenant_name
+#admin_tenant_name=<None>
+
+# Region name for connecting to neutron in admin context
+# (string value)
+# Deprecated group/name - [DEFAULT]/neutron_region_name
+#region_name=<None>
+
+# Authorization URL for connecting to neutron in admin context
+# (string value)
+# Deprecated group/name - [DEFAULT]/neutron_admin_auth_url
+#admin_auth_url=http://localhost:5000/v2.0
+
+# If set, ignore any SSL validation issues (boolean value)
+# Deprecated group/name - [DEFAULT]/neutron_api_insecure
+#api_insecure=false
+
+# Authorization strategy for connecting to neutron in admin
+# context (string value)
+# Deprecated group/name - [DEFAULT]/neutron_auth_strategy
+#auth_strategy=keystone
+
+# Name of Integration Bridge used by Open vSwitch (string
+# value)
+# Deprecated group/name - [DEFAULT]/neutron_ovs_bridge
+#ovs_bridge=br-int
+
+# Number of seconds before querying neutron for extensions
+# (integer value)
+# Deprecated group/name - [DEFAULT]/neutron_extension_sync_interval
+#extension_sync_interval=600
+
+# Location of CA certificates file to use for neutron client
+# requests. (string value)
+# Deprecated group/name - [DEFAULT]/neutron_ca_certificates_file
+#ca_certificates_file=<None>
+
+# Allow an instance to have multiple vNICs attached to the
+# same Neutron network. (boolean value)
+#allow_duplicate_networks=false
+
+
+[osapi_v3]
+
+#
+# Options defined in nova.api.openstack
+#
+
+# Whether the V3 API is enabled or not (boolean value)
+#enabled=false
+
+# A list of v3 API extensions to never load. Specify the
+# extension aliases here. (list value)
+#extensions_blacklist=
+
+# If the list is not empty then a v3 API extension will only
+# be loaded if it exists in this list. Specify the extension
+# aliases here. (list value)
+#extensions_whitelist=
+
+
+[oslo_messaging_amqp]
+
+#
+# Options defined in oslo.messaging
+#
+
+# address prefix used when sending to a specific server
+# (string value)
+#server_request_prefix=exclusive
+
+# address prefix used when broadcasting to all servers (string
+# value)
+#broadcast_prefix=broadcast
+
+# address prefix when sending to any server in group (string
+# value)
+#group_request_prefix=unicast
+
+# Name for the AMQP container (string value)
+#container_name=<None>
+
+# Timeout for inactive connections (in seconds) (integer
+# value)
+#idle_timeout=0
+
+# Debug: dump AMQP frames to stdout (boolean value)
+#trace=false
+
+# CA certificate PEM file for verifing server certificate
+# (string value)
+#ssl_ca_file=
+
+# Identifying certificate PEM file to present to clients
+# (string value)
+#ssl_cert_file=
+
+# Private key PEM file used to sign cert_file certificate
+# (string value)
+#ssl_key_file=
+
+# Password for decrypting ssl_key_file (if encrypted) (string
+# value)
+#ssl_key_password=<None>
+
+# Accept clients using either SSL or plain TCP (boolean value)
+#allow_insecure_clients=false
+
+
+[rdp]
+
+#
+# Options defined in nova.rdp
+#
+
+# Location of RDP html5 console proxy, in the form
+# "http://127.0.0.1:6083/" (string value)
+#html5_proxy_base_url=http://127.0.0.1:6083/
+
+# Enable RDP related features (boolean value)
+#enabled=false
+
+
+[serial_console]
+
+#
+# Options defined in nova.cmd.serialproxy
+#
+
+# Host on which to listen for incoming requests (string value)
+#serialproxy_host=0.0.0.0
+
+# Port on which to listen for incoming requests (integer
+# value)
+#serialproxy_port=6083
+
+
+#
+# Options defined in nova.console.serial
+#
+
+# Enable serial console related features (boolean value)
+#enabled=false
+
+# Range of TCP ports to use for serial ports on compute hosts
+# (string value)
+#port_range=10000:20000
+
+# Location of serial console proxy. (string value)
+#base_url=ws://127.0.0.1:6083/
+
+# IP address on which instance serial console should listen
+# (string value)
+#listen=127.0.0.1
+
+# The address to which proxy clients (like nova-serialproxy)
+# should connect (string value)
+#proxyclient_address=127.0.0.1
+
+
+[spice]
+
+#
+# Options defined in nova.cmd.spicehtml5proxy
+#
+
+# Host on which to listen for incoming requests (string value)
+# Deprecated group/name - [DEFAULT]/spicehtml5proxy_host
+#html5proxy_host=0.0.0.0
+
+# Port on which to listen for incoming requests (integer
+# value)
+# Deprecated group/name - [DEFAULT]/spicehtml5proxy_port
+#html5proxy_port=6082
+
+
+#
+# Options defined in nova.spice
+#
+
+# Location of spice HTML5 console proxy, in the form
+# "http://127.0.0.1:6082/spice_auto.html" (string value)
+#html5proxy_base_url=http://127.0.0.1:6082/spice_auto.html
+
+# IP address on which instance spice server should listen
+# (string value)
+#server_listen=127.0.0.1
+
+# The address to which proxy clients (like nova-
+# spicehtml5proxy) should connect (string value)
+#server_proxyclient_address=127.0.0.1
+
+# Enable spice related features (boolean value)
+#enabled=false
+
+# Enable spice guest agent support (boolean value)
+#agent_enabled=true
+
+# Keymap for spice (string value)
+#keymap=en-us
+
+
 [ssl]
 
 #
 # Options defined in nova.openstack.common.sslutils
 #
 
-# CA certificate file to use to verify connecting clients
+# CA certificate file to use to verify connecting clients.
 # (string value)
 #ca_file=<None>
 
-# Certificate file to use when starting the server securely
+# Certificate file to use when starting the server securely.
 # (string value)
 #cert_file=<None>
 
-# Private key file to use when starting the server securely
+# Private key file to use when starting the server securely.
 # (string value)
 #key_file=<None>
 
@@ -3140,25 +3528,29 @@
 # Options defined in nova.scheduler.filters.trusted_filter
 #
 
-# attestation server http (string value)
+# Attestation server HTTP (string value)
 #attestation_server=<None>
 
-# attestation server Cert file for Identity verification
+# Attestation server Cert file for Identity verification
 # (string value)
 #attestation_server_ca_file=<None>
 
-# attestation server port (string value)
+# Attestation server port (string value)
 #attestation_port=8443
 
-# attestation web API URL (string value)
+# Attestation web API URL (string value)
 #attestation_api_url=/OpenAttestationWebServices/V1.0
 
-# attestation authorization blob - must change (string value)
+# Attestation authorization blob - must change (string value)
 #attestation_auth_blob=<None>
 
 # Attestation status cache valid period length (integer value)
 #attestation_auth_timeout=60
 
+# Disable SSL cert verification for Attestation service
+# (boolean value)
+#attestation_insecure_ssl=false
+
 
 [upgrade_levels]
 
@@ -3254,54 +3646,37 @@
 #scheduler=<None>
 
 
-[matchmaker_ring]
-
-#
-# Options defined in nova.openstack.common.rpc.matchmaker_ring
-#
-
-# Matchmaker ring file (JSON) (string value)
-#ringfile=/etc/oslo/matchmaker_ring.json
-
-
 [vmware]
 
 #
 # Options defined in nova.virt.vmwareapi.driver
 #
 
-# URL for connection to VMware ESX/VC host. Required if
-# compute_driver is vmwareapi.VMwareESXDriver or
-# vmwareapi.VMwareVCDriver. (string value)
+# Hostname or IP address for connection to VMware VC host.
+# (string value)
 #host_ip=<None>
 
-# Username for connection to VMware ESX/VC host. Used only if
-# compute_driver is vmwareapi.VMwareESXDriver or
-# vmwareapi.VMwareVCDriver. (string value)
+# Port for connection to VMware VC host. (integer value)
+#host_port=443
+
+# Username for connection to VMware VC host. (string value)
 #host_username=<None>
 
-# Password for connection to VMware ESX/VC host. Used only if
-# compute_driver is vmwareapi.VMwareESXDriver or
-# vmwareapi.VMwareVCDriver. (string value)
+# Password for connection to VMware VC host. (string value)
 #host_password=<None>
 
-# Name of a VMware Cluster ComputeResource. Used only if
-# compute_driver is vmwareapi.VMwareVCDriver. (multi valued)
+# Name of a VMware Cluster ComputeResource. (multi valued)
 #cluster_name=<None>
 
-# Regex to match the name of a datastore. Used only if
-# compute_driver is vmwareapi.VMwareVCDriver. (string value)
+# Regex to match the name of a datastore. (string value)
 #datastore_regex=<None>
 
-# The interval used for polling of remote tasks. Used only if
-# compute_driver is vmwareapi.VMwareESXDriver or
-# vmwareapi.VMwareVCDriver. (floating point value)
-#task_poll_interval=5.0
+# The interval used for polling of remote tasks. (floating
+# point value)
+#task_poll_interval=0.5
 
 # The number of times we retry on failures, e.g., socket
-# error, etc. Used only if compute_driver is
-# vmwareapi.VMwareESXDriver or vmwareapi.VMwareVCDriver.
-# (integer value)
+# error, etc. (integer value)
 #api_retry_count=10
 
 # VNC starting port (integer value)
@@ -3310,15 +3685,14 @@
 # Total number of VNC ports (integer value)
 #vnc_port_total=10000
 
-# DEPRECATED. VNC password. The password-based access to VNC
-# consoles will be removed in the next release. The default
-# value will disable password protection on the VNC console.
-# (string value)
-#vnc_password=<None>
-
 # Whether to use linked clone (boolean value)
 #use_linked_clone=true
 
+# Optional VIM Service WSDL Location e.g
+# http://<server>/vimService.wsdl. Optional over-ride to
+# default location for bug work-arounds (string value)
+#wsdl_location=<None>
+
 
 #
 # Options defined in nova.virt.vmwareapi.vif
@@ -3328,15 +3702,8 @@
 # value)
 #vlan_interface=vmnic0
 
-
-#
-# Options defined in nova.virt.vmwareapi.vim
-#
-
-# Optional VIM Service WSDL Location e.g
-# http://<server>/vimService.wsdl. Optional over-ride to
-# default location for bug work-arounds (string value)
-#wsdl_location=<None>
+# Name of Integration Bridge (string value)
+#integration_bridge=br-int
 
 
 #
@@ -3353,39 +3720,265 @@
 #maximum_objects=100
 
 
-#
-# Options defined in nova.virt.vmwareapi.vmops
-#
-
-# Name of Integration Bridge (string value)
-#integration_bridge=br-int
-
-
-[spice]
-
-#
-# Options defined in nova.spice
-#
-
-# location of spice html5 console proxy, in the form
-# "http://127.0.0.1:6082/spice_auto.html" (string value)
-#html5proxy_base_url=http://127.0.0.1:6082/spice_auto.html
-
-# IP address on which instance spice server should listen
+[xenserver]
+
+#
+# Options defined in nova.virt.xenapi.agent
+#
+
+# Number of seconds to wait for agent reply (integer value)
+#agent_timeout=30
+
+# Number of seconds to wait for agent to be fully operational
+# (integer value)
+#agent_version_timeout=300
+
+# Number of seconds to wait for agent reply to resetnetwork
+# request (integer value)
+#agent_resetnetwork_timeout=60
+
+# Specifies the path in which the XenAPI guest agent should be
+# located. If the agent is present, network configuration is
+# not injected into the image. Used if
+# compute_driver=xenapi.XenAPIDriver and flat_injected=True
 # (string value)
-#server_listen=127.0.0.1
-
-# the address to which proxy clients (like nova-
-# spicehtml5proxy) should connect (string value)
-#server_proxyclient_address=127.0.0.1
-
-# enable spice related features (boolean value)
-#enabled=false
-
-# enable spice guest agent support (boolean value)
-#agent_enabled=true
-
-# keymap for spice (string value)
-#keymap=en-us
-
-
+#agent_path=usr/sbin/xe-update-networking
+
+# Disables the use of the XenAPI agent in any image regardless
+# of what image properties are present. (boolean value)
+#disable_agent=false
+
+# Determines if the XenAPI agent should be used when the image
+# used does not contain a hint to declare if the agent is
+# present or not. The hint is a glance property
+# "xenapi_use_agent" that has the value "True" or "False".
+# Note that waiting for the agent when it is not present will
+# significantly increase server boot times. (boolean value)
+#use_agent_default=false
+
+
+#
+# Options defined in nova.virt.xenapi.client.session
+#
+
+# Timeout in seconds for XenAPI login. (integer value)
+#login_timeout=10
+
+# Maximum number of concurrent XenAPI connections. Used only
+# if compute_driver=xenapi.XenAPIDriver (integer value)
+#connection_concurrent=5
+
+
+#
+# Options defined in nova.virt.xenapi.driver
+#
+
+# URL for connection to XenServer/Xen Cloud Platform. A
+# special value of unix://local can be used to connect to the
+# local unix socket.  Required if
+# compute_driver=xenapi.XenAPIDriver (string value)
+#connection_url=<None>
+
+# Username for connection to XenServer/Xen Cloud Platform.
+# Used only if compute_driver=xenapi.XenAPIDriver (string
+# value)
+#connection_username=root
+
+# Password for connection to XenServer/Xen Cloud Platform.
+# Used only if compute_driver=xenapi.XenAPIDriver (string
+# value)
+#connection_password=<None>
+
+# The interval used for polling of coalescing vhds. Used only
+# if compute_driver=xenapi.XenAPIDriver (floating point value)
+#vhd_coalesce_poll_interval=5.0
+
+# Ensure compute service is running on host XenAPI connects
+# to. (boolean value)
+#check_host=true
+
+# Max number of times to poll for VHD to coalesce. Used only
+# if compute_driver=xenapi.XenAPIDriver (integer value)
+#vhd_coalesce_max_attempts=20
+
+# Base path to the storage repository (string value)
+#sr_base_path=/var/run/sr-mount
+
+# The iSCSI Target Host (string value)
+#target_host=<None>
+
+# The iSCSI Target Port, default is port 3260 (string value)
+#target_port=3260
+
+# IQN Prefix (string value)
+#iqn_prefix=iqn.2010-10.org.openstack
+
+# Used to enable the remapping of VBD dev (Works around an
+# issue in Ubuntu Maverick) (boolean value)
+#remap_vbd_dev=false
+
+# Specify prefix to remap VBD dev to (ex. /dev/xvdb ->
+# /dev/sdb) (string value)
+#remap_vbd_dev_prefix=sd
+
+
+#
+# Options defined in nova.virt.xenapi.image.bittorrent
+#
+
+# Base URL for torrent files. (string value)
+#torrent_base_url=<None>
+
+# Probability that peer will become a seeder. (1.0 = 100%)
+# (floating point value)
+#torrent_seed_chance=1.0
+
+# Number of seconds after downloading an image via BitTorrent
+# that it should be seeded for other peers. (integer value)
+#torrent_seed_duration=3600
+
+# Cached torrent files not accessed within this number of
+# seconds can be reaped (integer value)
+#torrent_max_last_accessed=86400
+
+# Beginning of port range to listen on (integer value)
+#torrent_listen_port_start=6881
+
+# End of port range to listen on (integer value)
+#torrent_listen_port_end=6891
+
+# Number of seconds a download can remain at the same progress
+# percentage w/o being considered a stall (integer value)
+#torrent_download_stall_cutoff=600
+
+# Maximum number of seeder processes to run concurrently
+# within a given dom0. (-1 = no limit) (integer value)
+#torrent_max_seeder_processes_per_host=1
+
+
+#
+# Options defined in nova.virt.xenapi.pool
+#
+
+# To use for hosts with different CPUs (boolean value)
+#use_join_force=true
+
+
+#
+# Options defined in nova.virt.xenapi.vif
+#
+
+# Name of Integration Bridge used by Open vSwitch (string
+# value)
+#ovs_integration_bridge=xapi1
+
+
+#
+# Options defined in nova.virt.xenapi.vm_utils
+#
+
+# Cache glance images locally. `all` will cache all images,
+# `some` will only cache images that have the image_property
+# `cache_in_nova=True`, and `none` turns off caching entirely
+# (string value)
+#cache_images=all
+
+# Compression level for images, e.g., 9 for gzip -9. Range is
+# 1-9, 9 being most compressed but most CPU intensive on dom0.
+# (integer value)
+#image_compression_level=<None>
+
+# Default OS type (string value)
+#default_os_type=linux
+
+# Time to wait for a block device to be created (integer
+# value)
+#block_device_creation_timeout=10
+
+# Maximum size in bytes of kernel or ramdisk images (integer
+# value)
+#max_kernel_ramdisk_size=16777216
+
+# Filter for finding the SR to be used to install guest
+# instances on. To use the Local Storage in default
+# XenServer/XCP installations set this flag to other-config
+# :i18n-key=local-storage. To select an SR with a different
+# matching criteria, you could set it to other-
+# config:my_favorite_sr=true. On the other hand, to fall back
+# on the Default SR, as displayed by XenCenter, set this flag
+# to: default-sr:true (string value)
+#sr_matching_filter=default-sr:true
+
+# Whether to use sparse_copy for copying data on a resize down
+# (False will use standard dd). This speeds up resizes down
+# considerably since large runs of zeros won't have to be
+# rsynced (boolean value)
+#sparse_copy=true
+
+# Maximum number of retries to unplug VBD (integer value)
+#num_vbd_unplug_retries=10
+
+# Whether or not to download images via Bit Torrent
+# (all|some|none). (string value)
+#torrent_images=none
+
+# Name of network to use for booting iPXE ISOs (string value)
+#ipxe_network_name=<None>
+
+# URL to the iPXE boot menu (string value)
+#ipxe_boot_menu_url=<None>
+
+# Name and optionally path of the tool used for ISO image
+# creation (string value)
+#ipxe_mkisofs_cmd=mkisofs
+
+
+#
+# Options defined in nova.virt.xenapi.vmops
+#
+
+# Number of seconds to wait for instance to go to running
+# state (integer value)
+#running_timeout=60
+
+# The XenAPI VIF driver using XenServer Network APIs. (string
+# value)
+#vif_driver=nova.virt.xenapi.vif.XenAPIBridgeDriver
+
+# Dom0 plugin driver used to handle image uploads. (string
+# value)
+#image_upload_handler=nova.virt.xenapi.image.glance.GlanceStore
+
+
+#
+# Options defined in nova.virt.xenapi.volume_utils
+#
+
+# Number of seconds to wait for an SR to settle if the VDI
+# does not exist when first introduced (integer value)
+#introduce_vdi_retry_wait=20
+
+
+[zookeeper]
+
+#
+# Options defined in nova.servicegroup.drivers.zk
+#
+
+# The ZooKeeper addresses for servicegroup service in the
+# format of host1:port,host2:port,host3:port (string value)
+#address=<None>
+
+# The recv_timeout parameter for the zk session (integer
+# value)
+#recv_timeout=4000
+
+# The prefix used in ZooKeeper to store ephemeral nodes
+# (string value)
+#sg_prefix=/servicegroups
+
+# Number of seconds to wait until retrying to join the session
+# (integer value)
+#sg_retry_interval=5
+
+