From 2b265a707f8978609ef085dc1294610da9419d5f Mon Sep 17 00:00:00 2001 From: Lianhao Lu Date: Wed, 18 Dec 2013 15:22:03 +0800 Subject: [PATCH] Sync config generator from oslo-incubator Sync from oslo-incubator with the following patches about the config generator: 7c18261 Temporary workaround for config generator 4b3e32b Sort the output of config/generator.py by group name 806272e Improve error reporting on import failures 6cd1c33 Clean up extra modules code 3d077a3 Print the deprecated group/name for each option aec6d94 config.generator: allow extra modules importing ddc4f0d Fix error when no custom config file matches *.conf.sample d4bf84d Allow generate_sample MODULEPATH to be set in env UpgradeImpact DocImpact, the default values in keystone_authtoken config group are changed. Change-Id: If7181e14db2e43e42255bb6221d0543c13c4e5a6 --- etc/nova/nova.conf.sample | 2190 ++++++++++--------- nova/openstack/common/config/generator.py | 40 +- tools/config/generate_sample.sh | 15 +- tools/config/keystone_authtoken.conf.sample | 33 - tools/config/oslo.config.generator.rc | 1 + 5 files changed, 1221 insertions(+), 1058 deletions(-) delete mode 100644 tools/config/keystone_authtoken.conf.sample create mode 100644 tools/config/oslo.config.generator.rc diff --git a/etc/nova/nova.conf.sample b/etc/nova/nova.conf.sample index efcec13a73..8faaba9fc4 100644 --- a/etc/nova/nova.conf.sample +++ b/etc/nova/nova.conf.sample @@ -1426,6 +1426,7 @@ # configuration to any other existing logging options. Please # see the Python logging module documentation for details on # logging configuration files. (string value) +# Deprecated group/name - [DEFAULT]/log_config #log_config_append= # DEPRECATED. A logging.Formatter log message format string @@ -1441,10 +1442,12 @@ # (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= # (Optional) The base directory used for relative --log-file # paths (string value) +# Deprecated group/name - [DEFAULT]/logdir #log_dir= # Use syslog for logging. (boolean value) @@ -1535,6 +1538,7 @@ # # 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) @@ -1967,6 +1971,7 @@ # 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) @@ -2066,888 +2071,170 @@ #cinder_cross_az_attach=true -[keymgr] +[baremetal] # -# Options defined in nova.keymgr +# Options defined in nova.virt.baremetal.db.api # -# The full class name of the key manager API class (string -# value) -#api_class=nova.keymgr.conf_key_mgr.ConfKeyManager +# The backend to use for bare-metal database (string value) +#db_backend=sqlalchemy # -# Options defined in nova.keymgr.conf_key_mgr -# - -# Fixed key returned by key manager, specified in hex (string -# value) -#fixed_key= - - -[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= - -# 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 - - -[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 -# value) -#filesystems= - - -[vmware] - -# -# Options defined in nova.virt.vmwareapi.driver -# - -# URL for connection to VMware ESX/VC host. (string value) -#host_ip= - -# Username for connection to VMware ESX/VC host. (string -# value) -#host_username= - -# Password for connection to VMware ESX/VC host. (string -# value) -#host_password= - -# Name of a VMware Cluster ComputeResource. Used only if -# compute_driver is vmwareapi.VMwareVCDriver. (multi valued) -#cluster_name= - -# Regex to match the name of a datastore. Used only if -# compute_driver is vmwareapi.VMwareVCDriver. (string value) -#datastore_regex= - -# The interval used for polling of remote tasks. (floating -# point value) -#task_poll_interval=5.0 - -# The number of times we retry on failures, e.g., socket -# error, etc. (integer value) -#api_retry_count=10 - -# VNC starting port (integer value) -#vnc_port=5900 - -# Total number of VNC ports (integer value) -#vnc_port_total=10000 - -# Whether to use linked clone (boolean value) -#use_linked_clone=true - - -# -# Options defined in nova.virt.vmwareapi.vif -# - -# Physical ethernet adapter name for vlan networking (string -# value) -#vlan_interface=vmnic0 - - -# -# Options defined in nova.virt.vmwareapi.vim -# - -# Optional VIM Service WSDL Location e.g -# http:///vimService.wsdl. Optional over-ride to -# default location for bug work-arounds (string value) -#wsdl_location= - - -# -# Options defined in nova.virt.vmwareapi.vim_util -# - -# The maximum number of ObjectContent data objects that should -# be returned in a single result. A positive value will cause -# the operation to suspend the retrieval when the count of -# objects reaches the specified maximum. The server may still -# limit the count to something less than the configured value. -# Any remaining objects may be retrieved with additional -# requests. (integer value) -#maximum_objects=100 - - -# -# Options defined in nova.virt.vmwareapi.vmops -# - -# Name of Integration Bridge (string value) -#integration_bridge=br-int - - -[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= - - -[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) -#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= - -# 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= - -# 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=5 - -# Base path to the storage repository (string value) -#sr_base_path=/var/run/sr-mount - -# iSCSI Target Host (string value) -#target_host= - -# 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) -#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= - -# 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= - -# 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= - -# URL to the iPXE boot menu (string value) -#ipxe_boot_menu_url= - -# 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 - - -[rpc_notifier2] - -# -# Options defined in nova.openstack.common.notifier.rpc_notifier2 -# - -# AMQP topic(s) used for OpenStack notifications (list value) -#topics=notifications - - -[remote_debug] - -# -# Options defined in nova.service -# - -# Debug host (ip or name) to connect. Note that using the -# remote debug option changes how Nova uses the eventlet -# library to support async IO. This could result in failures -# that do not occur under normal operation. Use at your own -# risk. (string value) -#host= - -# Debug port to connect. Note that using the remote debug -# option changes how Nova uses the eventlet library to support -# async IO. This could result in failures that do not occur -# under normal operation. Use at your own risk. (integer -# value) -#port= - - -[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= - - -[libvirt] - -# -# Options defined in nova.virt.libvirt.driver -# - -# Rescue ami image (string value) -#rescue_image_id= - -# Rescue aki image (string value) -#rescue_kernel_id= - -# Rescue ari image (string value) -#rescue_ramdisk_id= - -# 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=true - -# The partition to inject to : -2 => disable, -1 => inspect -# (libguestfs only), 0 => not partitioned, >0 => partition -# number (integer value) -#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= - -# The libvirt VIF driver to configure the VIFs. (string value) -#vif_driver=nova.virt.libvirt.vif.LibvirtGenericVIFDriver - -# Libvirt handlers for remote volumes. (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) -#disk_prefix= - -# 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) -#cpu_mode= - -# 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= - -# 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= - - -# -# 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= - -# Create sparse logical volumes (with virtualsize) if this -# flag is set to True. (boolean value) -#sparse_logical_volumes=false - -# The amount of storage (in megabytes) to allocate for LVM -# snapshot copy-on-write blocks. (integer value) -#lvm_snapshot_size=1000 - -# the RADOS pool in which rbd volumes are stored (string -# value) -#images_rbd_pool=rbd - -# path to the ceph configuration file to use (string value) -#images_rbd_ceph_conf= - - -# -# 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) -#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= - -# the libvirt uuid of the secret for the rbd_uservolumes -# (string value) -#rbd_secret_uuid= - -# 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= - -# 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) -#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= - -# 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= - - -[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 "=, =, ...", where -# is one of the metric to be weighed, and 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= - - -[ssl] - -# -# Options defined in nova.openstack.common.sslutils -# - -# CA certificate file to use to verify connecting clients -# (string value) -#ca_file= - -# Certificate file to use when starting the server securely -# (string value) -#cert_file= - -# Private key file to use when starting the server securely -# (string value) -#key_file= - - -[matchmaker_ring] - -# -# Options defined in nova.openstack.common.rpc.matchmaker_ring -# - -# Matchmaker ring file (JSON) (string value) -#ringfile=/etc/oslo/matchmaker_ring.json - - -[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 -# (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 - - -[hyperv] - -# -# Options defined in nova.virt.hyperv.pathutils -# - -# The name of a Windows share name mapped to the -# "instances_path" dir and used by the resize feature to copy -# files to the target host. If left blank, an administrative -# share will be used, looking for the same "instances_path" -# used locally (string value) -#instances_path_share= - - -# -# Options defined in nova.virt.hyperv.utilsfactory -# - -# Force V1 WMI utility classes (boolean value) -#force_hyperv_utils_v1=false - -# Force V1 volume utility class (boolean value) -#force_volumeutils_v1=false - - -# -# Options defined in nova.virt.hyperv.vif -# - -# External virtual switch Name, if not provided, the first -# external virtual switch is used (string value) -#vswitch_name= - - -# -# Options defined in nova.virt.hyperv.vmops -# - -# Required for live migration among hosts with different CPU -# features (boolean value) -#limit_cpu_features=false - -# Sets the admin password in the config drive image (boolean -# value) -#config_drive_inject_password=false - -# qemu-img 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 -# a disk drive (boolean value) -#config_drive_cdrom=false - -# Enables metrics collections for an instance by using -# Hyper-V's metric APIs. Collected data can by retrieved by -# other apps and services, e.g.: Ceilometer. Requires Hyper-V -# / Windows Server 2012 and above (boolean value) -#enable_instance_metrics_collection=false - -# Enables dynamic memory allocation (ballooning) when set to a -# value greater than 1. The value expresses the ratio between -# the total RAM assigned to an instance and its startup RAM -# amount. For example a ratio of 2.0 for an instance with -# 1024MB of RAM implies 512MB of RAM allocated at startup -# (floating point value) -#dynamic_memory_ratio=1.0 - - -# -# Options defined in nova.virt.hyperv.volumeops -# - -# The number of times to retry to attach a volume (integer -# value) -#volume_attach_retry_count=10 - -# Interval between volume attachment attempts, in seconds -# (integer value) -#volume_attach_retry_interval=5 - - -[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 +# Options defined in nova.virt.baremetal.db.sqlalchemy.session # # The SQLAlchemy connection string used to connect to the -# database (string value) -#connection=sqlite:////nova/openstack/common/db/$sqlite_db +# bare-metal database (string value) +#sql_connection=sqlite:///$state_path/baremetal_$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 +# +# 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) +# Deprecated group/name - [DEFAULT]/instance_type_extra_specs +#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= + +# 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) -#idle_timeout=3600 +#ipmi_power_retry=10 -# 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= +# +# Options defined in nova.virt.baremetal.pxe +# -# 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 -# (integer value) -#max_overflow= - -# Verbosity of SQL debugging information. 0=None, -# 100=Everything (integer value) -#connection_debug=0 - -# Add python stack traces to SQL as comment strings (boolean +# Default kernel image ID used in deployment phase (string # value) -#connection_trace=false +#deploy_kernel= -# If set, use this value for pool_timeout with sqlalchemy -# (integer value) -#pool_timeout= +# Default ramdisk image ID used in deployment phase (string +# value) +#deploy_ramdisk= + +# 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=true + +# 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 +# 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 +# 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= + + +# +# 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. +# (string value) +#iscsi_iqn_prefix=iqn.2010-10.org.openstack.baremetal [cells] @@ -3097,169 +2384,593 @@ #offset_weight_multiplier=1.0 -[baremetal] +[conductor] # -# Options defined in nova.virt.baremetal.db.api +# Options defined in nova.conductor.api # -# The backend to use for bare-metal database (string value) -#db_backend=sqlalchemy +# 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= + + +[database] + +# +# Options defined in nova.openstack.common.db.api +# + +# The backend to use for db (string value) +# Deprecated group/name - [DEFAULT]/db_backend +#backend=sqlalchemy + +# Enable the experimental use of thread pooling for all DB API +# calls (boolean value) +# Deprecated group/name - [DEFAULT]/dbapi_use_tpool +#use_tpool=false # -# Options defined in nova.virt.baremetal.db.sqlalchemy.session +# Options defined in nova.openstack.common.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 +# database (string value) +# Deprecated group/name - [DEFAULT]/sql_connection +# Deprecated group/name - [DATABASE]/sql_connection +#connection=sqlite:////nova/openstack/common/db/$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 +# value) +# Deprecated group/name - [DEFAULT]/sql_idle_timeout +# Deprecated group/name - [DATABASE]/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= + +# 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 + +# 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= + +# 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= + + +[docker] + +# +# Options defined in nova.virt.docker.driver +# + +# Default TCP port to find the docker-registry container +# (integer value) +# Deprecated group/name - [DEFAULT]/docker_registry_default_port +#registry_default_port=5042 + + +[hyperv] + +# +# Options defined in nova.virt.hyperv.pathutils +# + +# The name of a Windows share name mapped to the +# "instances_path" dir and used by the resize feature to copy +# files to the target host. If left blank, an administrative +# share will be used, looking for the same "instances_path" +# used locally (string value) +#instances_path_share= # -# Options defined in nova.virt.baremetal.driver +# Options defined in nova.virt.hyperv.utilsfactory # -# Baremetal VIF driver. (string value) -#vif_driver=nova.virt.baremetal.vif_driver.BareMetalVIFDriver +# Force V1 WMI utility classes (boolean value) +#force_hyperv_utils_v1=false -# 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 +# Force V1 volume utility class (boolean value) +#force_volumeutils_v1=false # -# Options defined in nova.virt.baremetal.ipmi +# Options defined in nova.virt.hyperv.vif # -# path to baremetal terminal program (string value) -#terminal=shellinaboxd +# External virtual switch Name, if not provided, the first +# external virtual switch is used (string value) +#vswitch_name= -# path to baremetal terminal SSL cert(PEM) (string value) -#terminal_cert_dir= -# path to directory stores pidfiles of baremetal_terminal +# +# Options defined in nova.virt.hyperv.vmops +# + +# Required for live migration among hosts with different CPU +# features (boolean value) +#limit_cpu_features=false + +# Sets the admin password in the config drive image (boolean +# value) +#config_drive_inject_password=false + +# qemu-img is used to convert between different image types # (string value) -#terminal_pid_dir=$state_path/baremetal/console +#qemu_img_cmd=qemu-img.exe -# maximal number of retries for IPMI operations (integer +# Attaches the Config Drive image as a cdrom drive instead of +# a disk drive (boolean value) +#config_drive_cdrom=false + +# Enables metrics collections for an instance by using +# Hyper-V's metric APIs. Collected data can by retrieved by +# other apps and services, e.g.: Ceilometer. Requires Hyper-V +# / Windows Server 2012 and above (boolean value) +#enable_instance_metrics_collection=false + +# Enables dynamic memory allocation (ballooning) when set to a +# value greater than 1. The value expresses the ratio between +# the total RAM assigned to an instance and its startup RAM +# amount. For example a ratio of 2.0 for an instance with +# 1024MB of RAM implies 512MB of RAM allocated at startup +# (floating point value) +#dynamic_memory_ratio=1.0 + + +# +# Options defined in nova.virt.hyperv.volumeops +# + +# The number of times to retry to attach a volume (integer # value) -#ipmi_power_retry=10 +#volume_attach_retry_count=10 +# Interval between volume attachment attempts, in seconds +# (integer value) +#volume_attach_retry_interval=5 + + +[image_file_url] # -# Options defined in nova.virt.baremetal.pxe +# Options defined in nova.image.download.file # -# Default kernel image ID used in deployment phase (string +# A list of filesystems that will be configured in this file +# under the sections image_file_url: (list # value) -#deploy_kernel= +#filesystems= -# Default ramdisk image ID used in deployment phase (string + +[keymgr] + +# +# Options defined in nova.keymgr +# + +# The full class name of the key manager API class (string # value) -#deploy_ramdisk= +#api_class=nova.keymgr.conf_key_mgr.ConfKeyManager -# 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 +# +# Options defined in nova.keymgr.conf_key_mgr +# + +# Fixed key returned by key manager, specified in hex (string # value) -#pxe_append_params=nofb nomodeset vga=normal +#fixed_key= -# 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=true +[keystone_authtoken] -# Timeout for PXE deployments. Default: 0 (unlimited) (integer +# +# Options defined in keystoneclient.middleware.auth_token +# + +# Prefix to prepend at the beginning of the path (string # value) -#pxe_deploy_timeout=0 +#auth_admin_prefix= -# 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 +# Host providing the admin Identity API endpoint (string # value) -#virtual_power_type=virsh +#auth_host=127.0.0.1 -# user to execute virtual power commands as (string value) -#virtual_power_host_user= +# Port of the admin Identity API endpoint (integer value) +#auth_port=35357 -# 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= - - -# -# 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. +# Protocol of the admin Identity API endpoint(http or https) # (string value) -#iscsi_iqn_prefix=iqn.2010-10.org.openstack.baremetal +#auth_protocol=https + +# Complete public Identity API endpoint (string value) +#auth_uri= + +# API version of the admin Identity API endpoint (string +# value) +#auth_version= + +# 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. (boolean value) +#http_connect_timeout= + +# How many times are we trying to reconnect when communicating +# 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= + +# Single shared secret with the Keystone configuration used +# for bootstrapping a Keystone installation, or otherwise +# bypassing the normal authentication process. (string value) +#admin_token= + +# Keystone account username (string value) +#admin_user= + +# Keystone account password (string value) +#admin_password= + +# Keystone service account tenant name to validate user tokens +# (string value) +#admin_tenant_name=admin + +# Env key for the swift cache (string value) +#cache= + +# Required if Keystone server requires client certificate +# (string value) +#certfile= + +# Required if Keystone server requires client certificate +# (string value) +#keyfile= + +# A PEM encoded Certificate Authority to use when verifying +# HTTPs connections. Defaults to system CAs. (string value) +#cafile= + +# Verify HTTPS connections. (boolean value) +#insecure=false + +# Directory used to cache files related to PKI tokens (string +# value) +#signing_dir= + +# If defined, the memcache server(s) to use for caching (list +# value) +# Deprecated group/name - [DEFAULT]/memcache_servers +#memcached_servers= + +# 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) +#token_cache_time=300 + +# Value only used for unit testing (integer value) +#revocation_cache_time=1 + +# (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= + +# (optional, mandatory if memcache_security_strategy is +# defined) this string is used for key derivation. (string +# value) +#memcache_secret_key= + + +[libvirt] + +# +# Options defined in nova.virt.libvirt.driver +# + +# Rescue ami image (string value) +#rescue_image_id= + +# Rescue aki image (string value) +#rescue_kernel_id= + +# Rescue ari image (string value) +#rescue_ramdisk_id= + +# 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=true + +# 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=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= + +# The libvirt VIF driver to configure the VIFs. (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 +#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= + +# 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 +# "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) +# Deprecated group/name - [DEFAULT]/libvirt_cpu_mode +#cpu_mode= + +# 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= + +# 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) +#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= + + +# +# 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) +# 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= + +# 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 + +# The amount of storage (in megabytes) to allocate for LVM +# snapshot copy-on-write blocks. (integer value) +#lvm_snapshot_size=1000 + +# 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= + + +# +# 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) +# Deprecated group/name - [DEFAULT]/libvirt_snashot_compression +#snapshot_compression=false + + +# +# Options defined in nova.virt.libvirt.vif +# + +# Use virtio for bridge interfaces with KVM/QEMU (boolean +# value) +# Deprecated group/name - [DEFAULT]/libvirt_use_virtio_for_bridges +#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= + +# the libvirt uuid of the secret for the rbd_uservolumes +# (string value) +#rbd_secret_uuid= + +# 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= + +# 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) +# 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 +# value) +#scality_sofs_config= + +# 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] @@ -3278,15 +2989,130 @@ #password= -[docker] +[matchmaker_ring] # -# Options defined in nova.virt.docker.driver +# Options defined in nova.openstack.common.rpc.matchmaker_ring # -# Default TCP port to find the docker-registry container -# (integer value) -#registry_default_port=5042 +# 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 "=, =, ...", where +# is one of the metric to be weighed, and 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= + + +[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= + + +[remote_debug] + +# +# Options defined in nova.service +# + +# Debug host (ip or name) to connect. Note that using the +# remote debug option changes how Nova uses the eventlet +# library to support async IO. This could result in failures +# that do not occur under normal operation. Use at your own +# risk. (string value) +#host= + +# Debug port to connect. Note that using the remote debug +# option changes how Nova uses the eventlet library to support +# async IO. This could result in failures that do not occur +# under normal operation. Use at your own risk. (integer +# value) +#port= + + +[rpc_notifier2] + +# +# Options defined in nova.openstack.common.notifier.rpc_notifier2 +# + +# AMQP topic(s) used for OpenStack notifications (list value) +#topics=notifications + + +[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 +# (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 +# (string value) +#ca_file= + +# Certificate file to use when starting the server securely +# (string value) +#cert_file= + +# Private key file to use when starting the server securely +# (string value) +#key_file= [trusted_computing] @@ -3407,36 +3233,384 @@ #scheduler= -[keystone_authtoken] +[vmware] # -# Options defined in keystoneclient's authtoken middleware +# Options defined in nova.virt.vmwareapi.driver # -# Host providing the admin Identity API endpoint -auth_host = 127.0.0.1 +# URL for connection to VMware ESX/VC host. (string value) +#host_ip= -# Port of the admin Identity API endpoint -auth_port = 35357 +# Username for connection to VMware ESX/VC host. (string +# value) +#host_username= -# Protocol of the admin Identity API endpoint -auth_protocol = http +# Password for connection to VMware ESX/VC host. (string +# value) +#host_password= -# Keystone service account tenant name to validate user tokens -admin_tenant_name = %SERVICE_TENANT_NAME% +# Name of a VMware Cluster ComputeResource. Used only if +# compute_driver is vmwareapi.VMwareVCDriver. (multi valued) +#cluster_name= -# Keystone account username -admin_user = %SERVICE_USER% +# Regex to match the name of a datastore. Used only if +# compute_driver is vmwareapi.VMwareVCDriver. (string value) +#datastore_regex= -# Keystone account password -admin_password = %SERVICE_PASSWORD% +# The interval used for polling of remote tasks. (floating +# point value) +#task_poll_interval=5.0 + +# The number of times we retry on failures, e.g., socket +# error, etc. (integer value) +#api_retry_count=10 + +# VNC starting port (integer value) +#vnc_port=5900 + +# Total number of VNC ports (integer value) +#vnc_port_total=10000 + +# Whether to use linked clone (boolean value) +#use_linked_clone=true + + +# +# Options defined in nova.virt.vmwareapi.vif +# + +# Physical ethernet adapter name for vlan networking (string +# value) +#vlan_interface=vmnic0 + + +# +# Options defined in nova.virt.vmwareapi.vim +# + +# Optional VIM Service WSDL Location e.g +# http:///vimService.wsdl. Optional over-ride to +# default location for bug work-arounds (string value) +#wsdl_location= + + +# +# Options defined in nova.virt.vmwareapi.vim_util +# + +# The maximum number of ObjectContent data objects that should +# be returned in a single result. A positive value will cause +# the operation to suspend the retrieval when the count of +# objects reaches the specified maximum. The server may still +# limit the count to something less than the configured value. +# Any remaining objects may be retrieved with additional +# requests. (integer value) +#maximum_objects=100 + + +# +# Options defined in nova.virt.vmwareapi.vmops +# + +# Name of Integration Bridge (string value) +#integration_bridge=br-int + + +[xenserver] + +# +# Options defined in nova.virt.xenapi.agent +# + +# 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 +# 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) +# 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 +# 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) +# Deprecated group/name - [DEFAULT]/xenapi_use_agent_default +#use_agent_default=false + + +# +# Options defined in nova.virt.xenapi.client.session +# + +# 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 + + +# +# 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) +# Deprecated group/name - [DEFAULT]/xenapi_connection_url +#connection_url= + +# 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= + +# 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=5 + +# Base path to the storage repository (string value) +# Deprecated group/name - [DEFAULT]/xenapi_sr_base_path +#sr_base_path=/var/run/sr-mount + +# iSCSI Target Host (string value) +# Deprecated group/name - [DEFAULT]/target_host +#target_host= + +# iSCSI Target Port, 3260 Default (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 + + +# +# Options defined in nova.virt.xenapi.image.bittorrent +# + +# Base URL for torrent files. (string value) +# Deprecated group/name - [DEFAULT]/xenapi_torrent_base_url +#torrent_base_url= + +# 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 + + +# +# Options defined in nova.virt.xenapi.pool +# + +# To use for hosts with different CPUs (boolean value) +# Deprecated group/name - [DEFAULT]/use_join_force +#use_join_force=true + + +# +# Options defined in nova.virt.xenapi.vif +# + +# Name of Integration Bridge used by Open vSwitch (string +# value) +# Deprecated group/name - [DEFAULT]/xenapi_ovs_integration_bridge +#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) +# 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= + +# 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 +# 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) +# 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= + +# URL to the iPXE boot menu (string value) +# Deprecated group/name - [DEFAULT]/xenapi_ipxe_boot_menu_url +#ipxe_boot_menu_url= + +# 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 + + +# +# Options defined in nova.virt.xenapi.vmops +# + +# 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 + + +[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= + +# 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 -# Directory used to cache files related to PKI tokens -# signing_dir is configurable, but the default behavior of the authtoken -# middleware should be sufficient. It will create a temporary directory -# in the home directory for the user the nova process is running as. -#signing_dir = /var/lib/nova/keystone-signing -# API version of the admin Identity API endpoint -# Workaround for https://bugs.launchpad.net/nova/+bug/1154809 -auth_version = v2.0 diff --git a/nova/openstack/common/config/generator.py b/nova/openstack/common/config/generator.py index 335b35fdc9..bc8772af35 100644 --- a/nova/openstack/common/config/generator.py +++ b/nova/openstack/common/config/generator.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 SINA Corporation # All Rights Reserved. # @@ -28,6 +26,7 @@ import sys import textwrap from oslo.config import cfg +import six from nova.openstack.common import gettextutils from nova.openstack.common import importutils @@ -78,6 +77,16 @@ def generate(srcfiles): # The options list is a list of (module, options) tuples opts_by_group = {'DEFAULT': []} + extra_modules = os.getenv("NOVA_CONFIG_GENERATOR_EXTRA_MODULES", "") + if extra_modules: + for module_name in extra_modules.split(','): + module_name = module_name.strip() + module = _import_module(module_name) + if module: + for group, opts in _list_opts(module): + opts_by_group.setdefault(group, []).append((module_name, + opts)) + for pkg_name in pkg_names: mods = mods_by_pkg.get(pkg_name) mods.sort() @@ -93,8 +102,8 @@ def generate(srcfiles): opts_by_group.setdefault(group, []).append((mod_str, opts)) print_group_opts('DEFAULT', opts_by_group.pop('DEFAULT', [])) - for group, opts in opts_by_group.items(): - print_group_opts(group, opts) + for group in sorted(opts_by_group.keys()): + print_group_opts(group, opts_by_group[group]) def _import_module(mod_str): @@ -104,17 +113,17 @@ def _import_module(mod_str): return sys.modules[mod_str[4:]] else: return importutils.import_module(mod_str) - except ImportError as ie: - sys.stderr.write("%s\n" % str(ie)) - return None - except Exception: + except Exception as e: + sys.stderr.write("Error importing module %s: %s\n" % (mod_str, str(e))) return None def _is_in_group(opt, group): "Check if opt is in group." for key, value in group._opts.items(): - if value['opt'] == opt: + # NOTE(llu): Temporary workaround for bug #1262148, wait until + # newly released oslo.config support '==' operator. + if not(value['opt'] != opt): return True return False @@ -214,11 +223,19 @@ def _print_opt(opt): sys.exit(1) opt_help += ' (' + OPT_TYPES[opt_type] + ')' print('#', "\n# ".join(textwrap.wrap(opt_help, WORDWRAP_WIDTH))) + if opt.deprecated_opts: + for deprecated_opt in opt.deprecated_opts: + if deprecated_opt.name: + deprecated_group = (deprecated_opt.group if + deprecated_opt.group else "DEFAULT") + print('# Deprecated group/name - [%s]/%s' % + (deprecated_group, + deprecated_opt.name)) try: if opt_default is None: print('#%s=' % opt_name) elif opt_type == STROPT: - assert(isinstance(opt_default, basestring)) + assert(isinstance(opt_default, six.string_types)) print('#%s=%s' % (opt_name, _sanitize_default(opt_name, opt_default))) elif opt_type == BOOLOPT: @@ -247,9 +264,6 @@ def _print_opt(opt): def main(): - if len(sys.argv) < 2: - print("usage: %s [srcfile]...\n" % sys.argv[0]) - sys.exit(0) generate(sys.argv[1:]) if __name__ == '__main__': diff --git a/tools/config/generate_sample.sh b/tools/config/generate_sample.sh index 5787bc9d4f..828fbfc7a0 100755 --- a/tools/config/generate_sample.sh +++ b/tools/config/generate_sample.sh @@ -77,16 +77,23 @@ find $TARGETDIR -type f -name "*.pyc" -delete FILES=$(find $TARGETDIR -type f -name "*.py" ! -path "*/tests/*" \ -exec grep -l "Opt(" {} + | sed -e "s/^$BASEDIRESC\///g" | sort -u) +EXTRA_MODULES_FILE="`dirname $0`/oslo.config.generator.rc" +if test -r "$EXTRA_MODULES_FILE" +then + source "$EXTRA_MODULES_FILE" +fi + export EVENTLET_NO_GREENDNS=yes OS_VARS=$(set | sed -n '/^OS_/s/=[^=]*$//gp' | xargs) [ "$OS_VARS" ] && eval "unset \$OS_VARS" - -MODULEPATH=nova.openstack.common.config.generator +DEFAULT_MODULEPATH=nova.openstack.common.config.generator +MODULEPATH=${MODULEPATH:-$DEFAULT_MODULEPATH} OUTPUTFILE=$OUTPUTDIR/$PACKAGENAME.conf.sample python -m $MODULEPATH $FILES > $OUTPUTFILE -# Hook to allow projects to specify custom config file snippets -for CONCAT_FILE in $BASEDIR/tools/config/*.conf.sample; do +# Hook to allow projects to append custom config file snippets +CONCAT_FILES=$(ls $BASEDIR/tools/config/*.conf.sample 2>/dev/null) +for CONCAT_FILE in $CONCAT_FILES; do cat $CONCAT_FILE >> $OUTPUTFILE done diff --git a/tools/config/keystone_authtoken.conf.sample b/tools/config/keystone_authtoken.conf.sample deleted file mode 100644 index b8388647d5..0000000000 --- a/tools/config/keystone_authtoken.conf.sample +++ /dev/null @@ -1,33 +0,0 @@ -[keystone_authtoken] - -# -# Options defined in keystoneclient's authtoken middleware -# - -# Host providing the admin Identity API endpoint -auth_host = 127.0.0.1 - -# Port of the admin Identity API endpoint -auth_port = 35357 - -# Protocol of the admin Identity API endpoint -auth_protocol = http - -# Keystone service account tenant name to validate user tokens -admin_tenant_name = %SERVICE_TENANT_NAME% - -# Keystone account username -admin_user = %SERVICE_USER% - -# Keystone account password -admin_password = %SERVICE_PASSWORD% - -# Directory used to cache files related to PKI tokens -# signing_dir is configurable, but the default behavior of the authtoken -# middleware should be sufficient. It will create a temporary directory -# in the home directory for the user the nova process is running as. -#signing_dir = /var/lib/nova/keystone-signing - -# API version of the admin Identity API endpoint -# Workaround for https://bugs.launchpad.net/nova/+bug/1154809 -auth_version = v2.0 diff --git a/tools/config/oslo.config.generator.rc b/tools/config/oslo.config.generator.rc new file mode 100644 index 0000000000..3b5c2fd491 --- /dev/null +++ b/tools/config/oslo.config.generator.rc @@ -0,0 +1 @@ +export NOVA_CONFIG_GENERATOR_EXTRA_MODULES=keystoneclient.middleware.auth_token