[openstack-nova] Update to upstream 2014.2.rc1
Alan Pevec
apevec at fedoraproject.org
Wed Oct 1 15:19:32 UTC 2014
commit c9e258d9d66ad7db7185b63ed3b29d2d2c5c03e5
Author: Alan Pevec <alan.pevec at redhat.com>
Date: Wed Oct 1 14:58:11 2014 +0200
Update to upstream 2014.2.rc1
.gitignore | 1 +
...e-don-t-access-the-net-when-building-docs.patch | 24 -
... => 0001-remove-runtime-dep-on-python-pbr.patch | 2 +-
...Move-notification-point-to-a-better-place.patch | 2 +-
nova.conf.sample | 1062 +++++++++++---------
openstack-nova.spec | 23 +-
sources | 2 +-
7 files changed, 600 insertions(+), 516 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0fb02f7..9573d7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@
/nova-2014.1.1.tar.gz
/nova-2014.2.b2.tar.gz
/nova-2014.2.b3.tar.gz
+/nova-2014.2.rc1.tar.gz
diff --git a/0002-remove-runtime-dep-on-python-pbr.patch b/0001-remove-runtime-dep-on-python-pbr.patch
similarity index 94%
rename from 0002-remove-runtime-dep-on-python-pbr.patch
rename to 0001-remove-runtime-dep-on-python-pbr.patch
index ff907f5..1fdf490 100644
--- a/0002-remove-runtime-dep-on-python-pbr.patch
+++ b/0001-remove-runtime-dep-on-python-pbr.patch
@@ -1,4 +1,4 @@
-From 7da8f61627f05106994dea807d4a0699309d847c Mon Sep 17 00:00:00 2001
+From da84415b7df94990d3de745c346cc699d04c2274 Mon Sep 17 00:00:00 2001
From: Nikola Dipanov <ndipanov at redhat.com>
Date: Fri, 14 Jun 2013 11:29:50 +0200
Subject: [PATCH] remove runtime dep on python-pbr
diff --git a/0003-Move-notification-point-to-a-better-place.patch b/0002-Move-notification-point-to-a-better-place.patch
similarity index 96%
rename from 0003-Move-notification-point-to-a-better-place.patch
rename to 0002-Move-notification-point-to-a-better-place.patch
index 2cfc3de..6ccd4e9 100644
--- a/0003-Move-notification-point-to-a-better-place.patch
+++ b/0002-Move-notification-point-to-a-better-place.patch
@@ -1,4 +1,4 @@
-From 45807f91946eef2c429d7c1aab5e9168fd8cdd5b Mon Sep 17 00:00:00 2001
+From 612d37e6ca8979aa34386acf31a8eb8e0310730a Mon Sep 17 00:00:00 2001
From: Alan Pevec <apevec at redhat.com>
Date: Mon, 14 Apr 2014 18:11:04 +0200
Subject: [PATCH] Move notification point to a better place
diff --git a/nova.conf.sample b/nova.conf.sample
index 7438ead..a519a2d 100644
--- a/nova.conf.sample
+++ b/nova.conf.sample
@@ -14,10 +14,6 @@
# Size of RPC connection pool. (integer value)
#rpc_conn_pool_size=30
-# Modules of exceptions that are permitted to be recreated
-# upon receiving exception data from an rpc call. (list value)
-#allowed_rpc_exception_modules=oslo.messaging.exceptions,nova.exception,cinder.exception,exceptions
-
# Qpid broker hostname. (string value)
#qpid_hostname=localhost
@@ -47,6 +43,10 @@
# 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
@@ -156,15 +156,6 @@
# Heartbeat time-to-live. (integer value)
#matchmaker_heartbeat_ttl=600
-# 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=<None>
-
# Size of RPC greenthread pool. (integer value)
#rpc_thread_pool_size=64
@@ -303,17 +294,6 @@
#
-# 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
#
@@ -344,9 +324,9 @@
# 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
+# 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
@@ -357,6 +337,12 @@
# Number of key pairs per user (integer value)
#quota_key_pairs=100
+# 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
@@ -541,7 +527,7 @@
# The strategy to use for auth: noauth or keystone. (string
# value)
-#auth_strategy=noauth
+#auth_strategy=keystone
# Treat X-Forwarded-For as the canonical remote address. Only
# enable this if you have a sanitizing proxy. (boolean value)
@@ -614,23 +600,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 formatted vendor data from (string value)
+# File to load JSON formatted vendor data from (string value)
#vendordata_jsonfile_path=<None>
@@ -804,18 +777,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
#
@@ -900,16 +861,24 @@
# (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 network bandwidth usage info. Not supported
-# on all hypervisors. Set to 0 to disable. (integer value)
+# 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)
+# 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
@@ -924,8 +893,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
@@ -937,6 +908,10 @@
# 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', 'shutdown', or
# 'reap'. Set to 'noop' to take no action. (string value)
@@ -968,6 +943,10 @@
# 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
@@ -997,6 +976,9 @@
# (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
@@ -1042,11 +1024,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
@@ -1122,39 +1104,6 @@
#
-# Options defined in nova.image.glance
-#
-
-# Default glance hostname or IP address (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 of 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
#
@@ -1285,9 +1234,6 @@
# Interface for public IP addresses (string value)
#public_interface=eth0
-# MTU setting for network interface (integer value)
-#network_device_mtu=<None>
-
# Location of nova-dhcpbridge (string value)
#dhcpbridge=$bindir/nova-dhcpbridge
@@ -1295,7 +1241,7 @@
#routing_source_ip=$my_ip
# Lifetime of a DHCP lease in seconds (integer value)
-#dhcp_lease_time=120
+#dhcp_lease_time=86400
# If set, uses specific DNS server for dnsmasq. Can be
# specified multiple times. (multi valued)
@@ -1436,12 +1382,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)
@@ -1459,63 +1399,6 @@
#
-# 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 id for connecting to neutron in admin context (string
-# value)
-#neutron_admin_tenant_id=<None>
-
-# Tenant name for connecting to neutron in admin context. This
-# option is mutually exclusive with neutron_admin_tenant_id.
-# Note that with Keystone V3 tenant names are only unique
-# within a domain. (string value)
-#neutron_admin_tenant_name=<None>
-
-# Region name for connecting to neutron in admin context
-# (string value)
-#neutron_region_name=<None>
-
-# Authorization 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
-
-# Authorization 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>
-
-
-#
# Options defined in nova.network.rpcapi
#
@@ -1537,6 +1420,22 @@
#
+# 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
#
@@ -1554,14 +1453,14 @@
# 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>
@@ -1569,7 +1468,7 @@
# 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)
@@ -1588,47 +1487,48 @@
# 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
+#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
+# 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=amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,oslo.messaging=INFO,iso8601=WARN
+# 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
-# publish error events (boolean value)
+# 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] "
-# The name of logging configuration file. It does not disable
-# existing loggers, but just appends specified logging
-# configuration to any other existing logging options. Please
-# see the Python logging module documentation for details on
-# logging configuration files. (string value)
+# 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>
@@ -1640,7 +1540,7 @@
#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
@@ -1649,22 +1549,23 @@
#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. Existing syslog format is DEPRECATED
-# during I, and then will be changed in J to honor RFC5424
-# (boolean value)
+# during I, and will change in J to honor RFC5424. (boolean
+# value)
#use_syslog=false
-# (Optional) Use syslog rfc5424 format for logging. If
-# enabled, will add APP-NAME (RFC5424) before the MSG part of
-# the syslog message. The old format without APP-NAME is
-# deprecated in I, and will be removed in J. (boolean 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 facility to receive log lines. (string value)
#syslog_log_facility=LOG_USER
@@ -1686,6 +1587,18 @@
#
+# 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)
+#policy_default_rule=default
+
+
+#
# Options defined in nova.pci.pci_request
#
@@ -1716,10 +1629,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
@@ -1772,8 +1681,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
@@ -1832,6 +1742,19 @@
#
+# 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
#
@@ -1864,6 +1787,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
#
@@ -1889,8 +1821,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
@@ -1903,21 +1835,9 @@
#
-# Options defined in nova.virt.cpu
-#
-
-# 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.disk.api
#
-# Template file for injected network (string value)
-#injected_network_template=$pybasedir/nova/virt/interfaces.template
-
# Name of the mkfs commands for ephemeral device. The format
# is <os_type>=<mkfs command> (multi valued)
#virt_mkfs=
@@ -1946,8 +1866,7 @@
# 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=<None>
# The default format an ephemeral_volume will be formatted
@@ -1987,17 +1906,27 @@
#
+# 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 (integer value)
+# 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)
-# Deprecated group/name - [DEFAULT]/base_dir_name
#image_cache_subdirectory_name=_base
# Should unused base images be removed? (boolean value)
@@ -2009,22 +1938,19 @@
#
-# Options defined in nova.virt.imagehandler
+# Options defined in nova.virt.images
#
-# Specifies which image handler extension names to use for
-# handling images. The first extension in the list which can
-# handle the image with a suitable location will be used.
-# (list value)
-#image_handlers=download
+# Force backing images to raw format (boolean value)
+#force_raw_images=true
#
-# Options defined in nova.virt.images
+# Options defined in nova.virt.netutils
#
-# Force backing images to raw format (boolean value)
-#force_raw_images=true
+# Template file for injected network (string value)
+#injected_network_template=$pybasedir/nova/virt/interfaces.template
#
@@ -2074,40 +2000,6 @@
#volume_api_class=nova.volume.cinder.API
-#
-# Options defined in nova.volume.cinder
-#
-
-# Info to match when looking for cinder in the service
-# catalog. Format is: separated values of the form:
-# <service_type>:<service_name>:<endpoint_type> (string value)
-#cinder_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)
-#os_region_name=<None>
-
-# Location of ca certificates file to use for cinder client
-# requests. (string value)
-#cinder_ca_certificates_file=<None>
-
-# Number of cinderclient retries on failed http calls (integer
-# value)
-#cinder_http_retries=3
-
-# Allow to perform insecure SSL requests to cinder (boolean
-# value)
-#cinder_api_insecure=false
-
-# Allow attach between instance and volume in different
-# availability zones. (boolean value)
-#cinder_cross_az_attach=true
-
-
[baremetal]
#
@@ -2141,7 +2033,6 @@
# flavor_extra_specs for this compute host to advertise. Valid
# entries are name=value, pairs For example, "key1:val1,
# key2:val2" (list value)
-# Deprecated group/name - [DEFAULT]/instance_type_extra_specs
#flavor_extra_specs=
# Baremetal driver back-end (pxe or tilera) (string value)
@@ -2421,6 +2312,53 @@
#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:
+# <service_type>:<service_name>:<endpoint_type> (string value)
+# 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)
+# 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)
+# Deprecated group/name - [DEFAULT]/cinder_ca_certificates_file
+#ca_certificates_file=<None>
+
+# Number of cinderclient retries on failed http calls (integer
+# value)
+# 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)
+# Deprecated group/name - [DEFAULT]/cinder_api_insecure
+#api_insecure=false
+
+# Allow attach between instance and volume in different
+# availability zones. (boolean value)
+# Deprecated group/name - [DEFAULT]/cinder_cross_az_attach
+#cross_az_attach=true
+
+
[conductor]
#
@@ -2442,113 +2380,66 @@
#workers=<None>
-[database]
+[ephemeral_storage_encryption]
#
-# Options defined in nova.db.sqlalchemy.api
+# Options defined in nova.compute.api
#
-# The SQLAlchemy connection string used to connect to the
-# slave database (string value)
-#slave_connection=<None>
-
-
-#
-# Options defined in nova.openstack.common.db.options
-#
+# Whether to encrypt ephemeral storage (boolean value)
+#enabled=false
-# The file name to use with SQLite (string value)
-#sqlite_db=nova.sqlite
+# 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
-# If True, SQLite uses synchronous mode (boolean value)
-#sqlite_synchronous=true
+# 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
-# The backend to use for db (string value)
-# Deprecated group/name - [DEFAULT]/db_backend
-#backend=sqlalchemy
-# The SQLAlchemy connection string used 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=<None>
+[glance]
-# The SQL mode to be used for MySQL sessions (default is
-# empty, meaning do not override any server-side SQL mode
-# setting) (string value)
-#mysql_sql_mode=<None>
+#
+# Options defined in nova.image.glance
+#
-# Timeout before idle sql connections are reaped (integer
-# value)
-# Deprecated group/name - [DEFAULT]/sql_idle_timeout
-# Deprecated group/name - [DATABASE]/sql_idle_timeout
-# Deprecated group/name - [sql]/idle_timeout
-#idle_timeout=3600
+# Default glance hostname or IP address (string value)
+# Deprecated group/name - [DEFAULT]/glance_host
+#host=$my_ip
-# 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
+# Default glance port (integer value)
+# Deprecated group/name - [DEFAULT]/glance_port
+#port=9292
-# 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>
+# Default protocol to use when connecting to glance. Set to
+# https for SSL. (string value)
+# Deprecated group/name - [DEFAULT]/glance_protocol
+#protocol=http
-# Maximum db connection retries during startup. (setting -1
-# implies an infinite retry count) (integer value)
-# Deprecated group/name - [DEFAULT]/sql_max_retries
-# Deprecated group/name - [DATABASE]/sql_max_retries
-#max_retries=10
+# 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>
-# 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
+# Allow to perform insecure SSL (https) requests to glance
+# (boolean value)
+# Deprecated group/name - [DEFAULT]/glance_api_insecure
+#api_insecure=false
-# If set, use this value for max_overflow with sqlalchemy
+# Number of retries when downloading an image from glance
# (integer value)
-# Deprecated group/name - [DEFAULT]/sql_max_overflow
-# Deprecated group/name - [DATABASE]/sqlalchemy_max_overflow
-#max_overflow=<None>
+# Deprecated group/name - [DEFAULT]/glance_num_retries
+#num_retries=0
-# 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
+# A list of url scheme that can be downloaded directly via the
+# direct_url. Currently supported schemes: [file]. (list
# 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 db connection retries (integer value)
-#db_retry_interval=1
-
-# Whether to increase interval between db connection retries,
-# up to db_max_retry_interval (boolean value)
-#db_inc_retry_interval=true
-
-# max seconds between db connection retries, if
-# db_inc_retry_interval is enabled (integer value)
-#db_max_retry_interval=10
-
-# maximum db connection retries before error is raised.
-# (setting -1 implies an infinite retry count) (integer value)
-#db_max_retries=20
+#allowed_direct_url_schemes=
[hyperv]
@@ -2619,6 +2510,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
@@ -2652,6 +2549,47 @@
#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)
+#api_retry_interval=2
+
+
[keymgr]
#
@@ -2675,27 +2613,33 @@
[keystone_authtoken]
#
-# Options defined in keystoneclient.middleware.auth_token
+# Options defined in keystonemiddleware.auth_token
#
-# Prefix to prepend at the beginning of the path (string
-# value)
+# 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 (string
-# value)
+# 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 (integer value)
+# 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)
-# (string value)
+# Protocol of the admin Identity API endpoint (http or https).
+# Deprecated, use identity_uri. (string value)
#auth_protocol=https
# Complete public Identity API endpoint (string value)
#auth_uri=<None>
+# Complete admin Identity API endpoint. This should specify
+# the unversioned root endpoint e.g. https://localhost:35357/
+# (string value)
+#identity_uri=<None>
+
# API version of the admin Identity API endpoint (string
# value)
#auth_version=<None>
@@ -2713,15 +2657,12 @@
# with Identity API Server. (integer value)
#http_request_max_retries=3
-# Allows to pass in the name of a fake http_handler callback
-# function used instead of httplib.HTTPConnection or
-# httplib.HTTPSConnection. Useful for unit testing where
-# network is not available. (string value)
-#http_handler=<None>
-
-# Single shared secret with the Keystone configuration used
-# for bootstrapping a Keystone installation, or otherwise
-# bypassing the normal authentication process. (string value)
+# 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>
# Keystone account username (string value)
@@ -2756,20 +2697,24 @@
# value)
#signing_dir=<None>
-# If defined, the memcache server(s) to use for caching (list
-# value)
+# 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 requests and validations, the
-# middleware uses an in-memory cache for the tokens the
-# Keystone API returns. This is only valid if memcache_servers
-# is defined. Set to -1 to disable caching completely.
-# (integer value)
+# 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
-# Value only used for unit testing (integer value)
-#revocation_cache_time=1
+# 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)
+#revocation_cache_time=10
# (optional) if defined, indicate whether token data should be
# authenticated or authenticated and encrypted. Acceptable
@@ -2785,6 +2730,32 @@
# value)
#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) max 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-
@@ -2802,6 +2773,23 @@
# value)
#enforce_token_bind=permissive
+# If true, the revocation list will be checked for cached
+# tokens. This requires that PKI tokens are configured on the
+# Keystone 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
+
[libvirt]
@@ -2809,7 +2797,8 @@
# Options defined in nova.virt.libvirt.driver
#
-# Rescue ami image (string value)
+# 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)
@@ -2820,27 +2809,22 @@
# Libvirt domain type (valid options are: kvm, lxc, qemu, uml,
# xen) (string value)
-# Deprecated group/name - [DEFAULT]/libvirt_type
#virt_type=kvm
# Override the default libvirt URI (which is dependent on
# virt_type) (string value)
-# Deprecated group/name - [DEFAULT]/libvirt_uri
#connection_uri=
# Inject the admin password at boot time, without an agent.
# (boolean value)
-# Deprecated group/name - [DEFAULT]/libvirt_inject_password
#inject_password=false
# Inject the ssh public key at boot time (boolean value)
-# Deprecated group/name - [DEFAULT]/libvirt_inject_key
#inject_key=false
# The partition to inject to : -2 => disable, -1 => inspect
# (libguestfs only), 0 => not partitioned, >0 => partition
# number (integer value)
-# Deprecated group/name - [DEFAULT]/libvirt_inject_partition
#inject_partition=-2
# Sync virtual and real mouse cursors in Windows VMs (boolean
@@ -2852,10 +2836,10 @@
#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
+#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_NON_SHARED_INC
+#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)
@@ -2865,27 +2849,20 @@
# vdi). Defaults to same as source image (string value)
#snapshot_image_format=<None>
-# DEPRECATED. The libvirt VIF driver to configure the
-# VIFs.This option is deprecated and will be removed in the
-# Juno release. (string value)
-# Deprecated group/name - [DEFAULT]/libvirt_vif_driver
-#vif_driver=nova.virt.libvirt.vif.LibvirtGenericVIFDriver
-
-# Libvirt handlers for remote volumes. (list value)
-# Deprecated group/name - [DEFAULT]/libvirt_volume_drivers
+# DEPRECATED. Libvirt handlers for remote volumes. This option
+# is deprecated and will be removed in the Kilo release. (list
+# value)
#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 virt_type. (valid options
# are: sd, xvd, uvd, vd) (string value)
-# Deprecated group/name - [DEFAULT]/libvirt_disk_prefix
#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)
-# Deprecated group/name - [DEFAULT]/libvirt_wait_soft_reboot_seconds
#wait_soft_reboot_seconds=120
# Set to "host-model" to clone the host CPU feature flags; to
@@ -2894,18 +2871,15 @@
# CPU model. If virt_type="kvm|qemu", it will default to
# "host-model", otherwise it will default to "none" (string
# value)
-# Deprecated group/name - [DEFAULT]/libvirt_cpu_mode
#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)
-# Deprecated group/name - [DEFAULT]/libvirt_cpu_model
#cpu_model=<None>
# Location where libvirt driver will store snapshots before
# uploading them to image service (string value)
-# Deprecated group/name - [DEFAULT]/libvirt_snapshots_directory
#snapshots_directory=$instances_path/snapshots
# Location where the Xen hvmloader is kept (string value)
@@ -2920,6 +2894,33 @@
# (string value)
#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)
+#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
@@ -2928,17 +2929,14 @@
# 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)
-# Deprecated group/name - [DEFAULT]/libvirt_images_type
#images_type=default
# LVM Volume Group that is used for VM images, when you
# specify images_type=lvm. (string value)
-# Deprecated group/name - [DEFAULT]/libvirt_images_volume_group
#images_volume_group=<None>
# Create sparse logical volumes (with virtualsize) if this
# flag is set to True. (boolean value)
-# Deprecated group/name - [DEFAULT]/libvirt_sparse_logical_volumes
#sparse_logical_volumes=false
# Method used to wipe old volumes (valid options are: none,
@@ -2951,13 +2949,16 @@
# The RADOS pool in which rbd volumes are stored (string
# value)
-# Deprecated group/name - [DEFAULT]/libvirt_images_rbd_pool
#images_rbd_pool=rbd
# Path to the ceph configuration file to use (string value)
-# Deprecated group/name - [DEFAULT]/libvirt_images_rbd_ceph_conf
#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
@@ -2990,7 +2991,6 @@
# Compress snapshot images when possible. This currently
# applies exclusively to qcow2 images (boolean value)
-# Deprecated group/name - [DEFAULT]/libvirt_snapshot_compression
#snapshot_compression=false
@@ -3000,7 +3000,6 @@
# Use virtio for bridge interfaces with KVM/QEMU (boolean
# value)
-# Deprecated group/name - [DEFAULT]/libvirt_use_virtio_for_bridges
#use_virtio_for_bridges=true
@@ -3041,11 +3040,9 @@
#glusterfs_mount_point_base=$state_path/mnt
# Use multipath connection of the iSCSI volume (boolean value)
-# Deprecated group/name - [DEFAULT]/libvirt_iscsi_use_multipath
#iscsi_use_multipath=false
# Use multipath connection of the iSER volume (boolean value)
-# Deprecated group/name - [DEFAULT]/libvirt_iser_use_multipath
#iser_use_multipath=false
# Path or URL to Scality SOFS configuration file (string
@@ -3060,6 +3057,22 @@
#qemu_allowed_storage_drivers=
+[matchmaker_redis]
+
+#
+# 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=<None>
+
+
[matchmaker_ring]
#
@@ -3104,6 +3117,101 @@
#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=false
+
+# 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]
#
@@ -3137,9 +3245,60 @@
#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
#
@@ -3310,20 +3469,20 @@
# Options defined in nova.virt.vmwareapi.driver
#
-# Hostname or IP address for connection to VMware ESX/VC host.
+# Hostname or IP address for connection to VMware VC host.
# (string value)
#host_ip=<None>
-# Username for connection to VMware ESX/VC host. (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. (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. (string value)
@@ -3346,6 +3505,11 @@
# 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
@@ -3355,15 +3519,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
#
@@ -3380,14 +3537,6 @@
#maximum_objects=100
-#
-# Options defined in nova.virt.vmwareapi.vmops
-#
-
-# Name of Integration Bridge (string value)
-#integration_bridge=br-int
-
-
[xenserver]
#
@@ -3395,17 +3544,14 @@
#
# Number of seconds to wait for agent reply (integer value)
-# Deprecated group/name - [DEFAULT]/agent_timeout
#agent_timeout=30
# Number of seconds to wait for agent to be fully operational
# (integer value)
-# Deprecated group/name - [DEFAULT]/agent_version_timeout
#agent_version_timeout=300
# Number of seconds to wait for agent reply to resetnetwork
# request (integer value)
-# Deprecated group/name - [DEFAULT]/agent_resetnetwork_timeout
#agent_resetnetwork_timeout=60
# Specifies the path in which the XenAPI guest agent should be
@@ -3413,12 +3559,10 @@
# not injected into the image. Used if
# compute_driver=xenapi.XenAPIDriver and flat_injected=True
# (string value)
-# Deprecated group/name - [DEFAULT]/xenapi_agent_path
#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)
-# Deprecated group/name - [DEFAULT]/xenapi_disable_agent
#disable_agent=false
# Determines if the XenAPI agent should be used when the image
@@ -3427,7 +3571,6 @@
# "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)
-# Deprecated group/name - [DEFAULT]/xenapi_use_agent_default
#use_agent_default=false
@@ -3436,12 +3579,10 @@
#
# Timeout in seconds for XenAPI login. (integer value)
-# Deprecated group/name - [DEFAULT]/xenapi_login_timeout
#login_timeout=10
# Maximum number of concurrent XenAPI connections. Used only
# if compute_driver=xenapi.XenAPIDriver (integer value)
-# Deprecated group/name - [DEFAULT]/xenapi_connection_concurrent
#connection_concurrent=5
@@ -3453,60 +3594,48 @@
# special value of unix://local can be used to connect to the
# local unix socket. Required if
# compute_driver=xenapi.XenAPIDriver (string value)
-# Deprecated group/name - [DEFAULT]/xenapi_connection_url
#connection_url=<None>
# Username for connection to XenServer/Xen Cloud Platform.
# Used only if compute_driver=xenapi.XenAPIDriver (string
# value)
-# Deprecated group/name - [DEFAULT]/xenapi_connection_username
#connection_username=root
# Password for connection to XenServer/Xen Cloud Platform.
# Used only if compute_driver=xenapi.XenAPIDriver (string
# value)
-# Deprecated group/name - [DEFAULT]/xenapi_connection_password
#connection_password=<None>
# The interval used for polling of coalescing vhds. Used only
# if compute_driver=xenapi.XenAPIDriver (floating point value)
-# Deprecated group/name - [DEFAULT]/xenapi_vhd_coalesce_poll_interval
#vhd_coalesce_poll_interval=5.0
# Ensure compute service is running on host XenAPI connects
# to. (boolean value)
-# Deprecated group/name - [DEFAULT]/xenapi_check_host
#check_host=true
# Max number of times to poll for VHD to coalesce. Used only
# if compute_driver=xenapi.XenAPIDriver (integer value)
-# Deprecated group/name - [DEFAULT]/xenapi_vhd_coalesce_max_attempts
#vhd_coalesce_max_attempts=20
# Base path to the storage repository (string value)
-# Deprecated group/name - [DEFAULT]/xenapi_sr_base_path
#sr_base_path=/var/run/sr-mount
# The iSCSI Target Host (string value)
-# Deprecated group/name - [DEFAULT]/target_host
#target_host=<None>
# The iSCSI Target Port, default is port 3260 (string value)
-# Deprecated group/name - [DEFAULT]/target_port
#target_port=3260
# IQN Prefix (string value)
-# Deprecated group/name - [DEFAULT]/iqn_prefix
#iqn_prefix=iqn.2010-10.org.openstack
# Used to enable the remapping of VBD dev (Works around an
# issue in Ubuntu Maverick) (boolean value)
-# Deprecated group/name - [DEFAULT]/xenapi_remap_vbd_dev
#remap_vbd_dev=false
# Specify prefix to remap VBD dev to (ex. /dev/xvdb ->
# /dev/sdb) (string value)
-# Deprecated group/name - [DEFAULT]/xenapi_remap_vbd_dev_prefix
#remap_vbd_dev_prefix=sd
@@ -3515,40 +3644,32 @@
#
# Base URL for torrent files. (string value)
-# Deprecated group/name - [DEFAULT]/xenapi_torrent_base_url
#torrent_base_url=<None>
# Probability that peer will become a seeder. (1.0 = 100%)
# (floating point value)
-# Deprecated group/name - [DEFAULT]/xenapi_torrent_seed_chance
#torrent_seed_chance=1.0
# Number of seconds after downloading an image via BitTorrent
# that it should be seeded for other peers. (integer value)
-# Deprecated group/name - [DEFAULT]/xenapi_torrent_seed_duration
#torrent_seed_duration=3600
# Cached torrent files not accessed within this number of
# seconds can be reaped (integer value)
-# Deprecated group/name - [DEFAULT]/xenapi_torrent_max_last_accessed
#torrent_max_last_accessed=86400
# Beginning of port range to listen on (integer value)
-# Deprecated group/name - [DEFAULT]/xenapi_torrent_listen_port_start
#torrent_listen_port_start=6881
# End of port range to listen on (integer value)
-# Deprecated group/name - [DEFAULT]/xenapi_torrent_listen_port_end
#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)
-# Deprecated group/name - [DEFAULT]/xenapi_torrent_download_stall_cutoff
#torrent_download_stall_cutoff=600
# Maximum number of seeder processes to run concurrently
# within a given dom0. (-1 = no limit) (integer value)
-# Deprecated group/name - [DEFAULT]/xenapi_torrent_max_seeder_processes_per_host
#torrent_max_seeder_processes_per_host=1
@@ -3557,7 +3678,6 @@
#
# To use for hosts with different CPUs (boolean value)
-# Deprecated group/name - [DEFAULT]/use_join_force
#use_join_force=true
@@ -3567,7 +3687,6 @@
# Name of Integration Bridge used by Open vSwitch (string
# value)
-# Deprecated group/name - [DEFAULT]/xenapi_ovs_integration_bridge
#ovs_integration_bridge=xapi1
@@ -3579,27 +3698,22 @@
# `some` will only cache images that have the image_property
# `cache_in_nova=True`, and `none` turns off caching entirely
# (string value)
-# Deprecated group/name - [DEFAULT]/cache_images
#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)
-# Deprecated group/name - [DEFAULT]/xenapi_image_compression_level
#image_compression_level=<None>
# Default OS type (string value)
-# Deprecated group/name - [DEFAULT]/default_os_type
#default_os_type=linux
# Time to wait for a block device to be created (integer
# value)
-# Deprecated group/name - [DEFAULT]/block_device_creation_timeout
#block_device_creation_timeout=10
# Maximum size in bytes of kernel or ramdisk images (integer
# value)
-# Deprecated group/name - [DEFAULT]/max_kernel_ramdisk_size
#max_kernel_ramdisk_size=16777216
# Filter for finding the SR to be used to install guest
@@ -3610,36 +3724,29 @@
# 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)
-# Deprecated group/name - [DEFAULT]/sr_matching_filter
#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)
-# Deprecated group/name - [DEFAULT]/xenapi_sparse_copy
#sparse_copy=true
# Maximum number of retries to unplug VBD (integer value)
-# Deprecated group/name - [DEFAULT]/xenapi_num_vbd_unplug_retries
#num_vbd_unplug_retries=10
# Whether or not to download images via Bit Torrent
# (all|some|none). (string value)
-# Deprecated group/name - [DEFAULT]/xenapi_torrent_images
#torrent_images=none
# Name of network to use for booting iPXE ISOs (string value)
-# Deprecated group/name - [DEFAULT]/xenapi_ipxe_network_name
#ipxe_network_name=<None>
# URL to the iPXE boot menu (string value)
-# Deprecated group/name - [DEFAULT]/xenapi_ipxe_boot_menu_url
#ipxe_boot_menu_url=<None>
# Name and optionally path of the tool used for ISO image
# creation (string value)
-# Deprecated group/name - [DEFAULT]/xenapi_ipxe_mkisofs_cmd
#ipxe_mkisofs_cmd=mkisofs
@@ -3649,17 +3756,14 @@
# Number of seconds to wait for instance to go to running
# state (integer value)
-# Deprecated group/name - [DEFAULT]/xenapi_running_timeout
#running_timeout=60
# The XenAPI VIF driver using XenServer Network APIs. (string
# value)
-# Deprecated group/name - [DEFAULT]/xenapi_vif_driver
#vif_driver=nova.virt.xenapi.vif.XenAPIBridgeDriver
# Dom0 plugin driver used to handle image uploads. (string
# value)
-# Deprecated group/name - [DEFAULT]/xenapi_image_upload_handler
#image_upload_handler=nova.virt.xenapi.image.glance.GlanceStore
diff --git a/openstack-nova.spec b/openstack-nova.spec
index 3a3b341..cedbe82 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -2,17 +2,17 @@
%global with_trans %{!?_without_trans:1}%{?_without_trans:0}
%global release_name juno
-%global milestone 3
+%global milestone rc1
Name: openstack-nova
Version: 2014.2
-Release: 0.4.b%{milestone}%{?dist}
+Release: 0.5%{milestone}%{?dist}
Summary: OpenStack Compute (nova)
Group: Applications/System
License: ASL 2.0
URL: http://openstack.org/projects/compute/
-Source0: http://launchpad.net/nova/%{release_name}/%{release_name}-%{milestone}/+download/nova-%{version}.b%{milestone}.tar.gz
+Source0: http://launchpad.net/nova/%{release_name}/%{release_name}-%{milestone}/+download/nova-%{version}.%{milestone}.tar.gz
Source1: nova-dist.conf
Source2: nova.conf.sample
@@ -40,11 +40,10 @@ Source24: nova-sudoers
Source30: openstack-nova-novncproxy.sysconfig
#
-# patches_base=2014.2.b3
+# patches_base=2014.2.rc1
#
-Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
-Patch0002: 0002-remove-runtime-dep-on-python-pbr.patch
-Patch0003: 0003-Move-notification-point-to-a-better-place.patch
+Patch0001: 0001-remove-runtime-dep-on-python-pbr.patch
+Patch0002: 0002-Move-notification-point-to-a-better-place.patch
BuildArch: noarch
BuildRequires: intltool
@@ -366,6 +365,8 @@ Requires: python-glanceclient >= 1:0
Requires: python-neutronclient
Requires: python-novaclient
Requires: python-oslo-config >= 1:1.2.0
+Requires: python-oslo-db
+Requires: python-oslo-vmware
Requires: python-pyasn1
Requires: python-six >= 1.4.1
Requires: python-babel
@@ -403,11 +404,10 @@ This package contains documentation files for nova.
%endif
%prep
-%setup -q -n nova-%{version}.b%{milestone}
+%setup -q -n nova-%{version}.%{milestone}
%patch0001 -p1
%patch0002 -p1
-%patch0003 -p1
find . \( -name .gitignore -o -name .placeholder \) -delete
@@ -417,7 +417,7 @@ sed -i '/setuptools_git/d' setup.py
sed -i s/REDHATNOVAVERSION/%{version}/ nova/version.py
sed -i s/REDHATNOVARELEASE/%{release}/ nova/version.py
-sed -i 's/%{version}.b%{milestone}/%{version}/' PKG-INFO
+sed -i 's/%{version}.%{milestone}/%{version}/' PKG-INFO
# make doc build compatible with python-oslo-sphinx RPM
sed -i 's/oslosphinx/oslo.sphinx/' doc/source/conf.py
@@ -747,6 +747,9 @@ exit 0
%endif
%changelog
+* Wed Oct 01 2014 Alan Pevec <alan.pevec at redhat.com> 2014.2-0.5rc1
+- Update to upstream 2014.2.rc1
+
* Wed Sep 10 2014 Alan Pevec <apevec at redhat.com> 2014.2-0.3.b3
- Update to Juno-3 milestone
diff --git a/sources b/sources
index 1e4cf50..108f4b4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9baf2597c4fbe413d253e5590b84ef2a nova-2014.2.b3.tar.gz
+7f1200abb078a0fd2ef81dd1989c8569 nova-2014.2.rc1.tar.gz
More information about the scm-commits
mailing list