diff --git a/doc/common/tables/nova-api.xml b/doc/common/tables/nova-api.xml index dd97610d1c..496258016a 100644 --- a/doc/common/tables/nova-api.xml +++ b/doc/common/tables/nova-api.xml @@ -57,11 +57,11 @@ osapi_compute_listen = 0.0.0.0 - (StrOpt) IP address for OpenStack API to listen + (StrOpt) The IP address on which the OpenStack API will listen. osapi_compute_listen_port = 8774 - (IntOpt) list port for osapi compute + (IntOpt) The port on which the OpenStack API will listen. osapi_compute_workers = None diff --git a/doc/common/tables/nova-authentication.xml b/doc/common/tables/nova-authentication.xml index 0ef12fa28b..181cd40d1c 100644 --- a/doc/common/tables/nova-authentication.xml +++ b/doc/common/tables/nova-authentication.xml @@ -17,7 +17,7 @@ api_rate_limit = False - (BoolOpt) whether to use per-user rate limiting for the api. + (BoolOpt) whether to use per-user rate limiting for the api. This option is only used by v2 api. rate limiting is removed from v3 api. auth_strategy = noauth diff --git a/doc/common/tables/nova-baremetal.xml b/doc/common/tables/nova-baremetal.xml index 6ec98ec84a..cd16a81f12 100644 --- a/doc/common/tables/nova-baremetal.xml +++ b/doc/common/tables/nova-baremetal.xml @@ -40,7 +40,7 @@ (ListOpt) 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" - ipmi_power_retry = 5 + ipmi_power_retry = 10 (IntOpt) maximal number of retries for IPMI operations @@ -52,7 +52,7 @@ (StrOpt) Baremetal power management method - pxe_append_params = None + pxe_append_params = nofb nomodeset vga=normal (StrOpt) additional append parameters for baremetal PXE boot @@ -91,10 +91,22 @@ tftp_root = /tftpboot (StrOpt) Baremetal compute node's tftp root path + + use_file_injection = True + (BoolOpt) If True, enable file injection for network info, files and admin password + use_unsafe_iscsi = False (BoolOpt) 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 + + vif_driver = nova.virt.xenapi.vif.XenAPIBridgeDriver + (StrOpt) The XenAPI VIF driver using XenServer Network APIs. + + + vif_driver = nova.virt.libvirt.vif.LibvirtGenericVIFDriver + (StrOpt) The libvirt VIF driver to configure the VIFs. + vif_driver = nova.virt.baremetal.vif_driver.BareMetalVIFDriver (StrOpt) Baremetal VIF driver. diff --git a/doc/common/tables/nova-cells.xml b/doc/common/tables/nova-cells.xml index 04814d15cf..8865358a12 100644 --- a/doc/common/tables/nova-cells.xml +++ b/doc/common/tables/nova-cells.xml @@ -24,7 +24,7 @@ (ListOpt) Key/Multi-value list with the capabilities of the cell - cell_type = None + cell_type = compute (StrOpt) Type of cell: api or compute @@ -79,6 +79,10 @@ name = nova (StrOpt) name of this cell + + offset_weight_multiplier = 1.0 + (FloatOpt) Multiplier used to weigh offset weigher. + reserve_percent = 10.0 (FloatOpt) Percentage of cell capacity to hold in reserve. Affects both memory and disk utilization diff --git a/doc/common/tables/nova-common.xml b/doc/common/tables/nova-common.xml index c0b126de16..5475368e91 100644 --- a/doc/common/tables/nova-common.xml +++ b/doc/common/tables/nova-common.xml @@ -15,6 +15,10 @@ + + api_audit_map = api_audit_map.conf + (StrOpt) File containing mapping for api paths and service endpoints + bindir = /usr/local/bin (StrOpt) Directory where nova binaries are installed @@ -43,6 +47,10 @@ host = 127.0.0.1 (StrOpt) Host to locate redis + + host = None + (StrOpt) 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. + lock_path = None (StrOpt) Directory to use for lock files. @@ -52,9 +60,13 @@ (ListOpt) Memcached servers or None for in process cache. - my_ip = 192.168.122.99 + my_ip = 192.168.0.8 (StrOpt) ip address of this host + + namespace = openstack + (StrOpt) namespace prefix for generated id + notification_driver = [] (MultiStrOpt) Driver or drivers to handle sending notifications @@ -72,7 +84,7 @@ (StrOpt) If set, send compute.instance.update notifications on instance state changes. Valid values are None for no notifications, "vm_state" for notifications on VM state changes, or "vm_and_task_state" for notifications on VM and task state changes. - pybasedir = /home/docwork/openstack-manuals-new/tools/autogenerate-config-docs/nova + pybasedir = /usr/lib/python2.7/site-packages (StrOpt) Directory where the nova python module is installed diff --git a/doc/common/tables/nova-compute.xml b/doc/common/tables/nova-compute.xml index 27a3d0c3cc..6792f77787 100644 --- a/doc/common/tables/nova-compute.xml +++ b/doc/common/tables/nova-compute.xml @@ -16,16 +16,8 @@ - base_dir_name = _base - (StrOpt) 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 - - - checksum_interval_seconds = 3600 - (IntOpt) How frequently to checksum base images - - - compute_api_class = nova.compute.api.API - (StrOpt) The full class name of the compute API class to use (deprecated) + compute_available_monitors = ['nova.compute.monitors.all_monitors'] + (MultiStrOpt) Monitor classes available to the compute which may be specified more than once. compute_driver = None @@ -35,6 +27,10 @@ compute_manager = nova.compute.manager.ComputeManager (StrOpt) full class name for the Manager for compute + + compute_monitors = + (ListOpt) A list of monitors that can be used for getting compute metrics. + compute_stats_class = nova.compute.stats.Stats (StrOpt) Class that will manage stats for the local compute host @@ -61,7 +57,7 @@ enable_instance_password = True - (BoolOpt) Allows use of instance password during server creation + (BoolOpt) Enables returning of the instance password by the relevant server API calls such as create, rebuild or rescue, If the hypervisor does not support password injection then the password returned will not be correct heal_instance_info_cache_interval = 60 @@ -76,8 +72,8 @@ (IntOpt) Number of seconds to wait between runs of the image cache manager - image_info_filename_pattern = $instances_path/$base_dir_name/%(image)s.info - (StrOpt) Allows image information files to be stored in non-standard locations + image_cache_subdirectory_name = _base + (StrOpt) 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 instance_build_timeout = 0 @@ -120,8 +116,8 @@ (BoolOpt) Whether to start guests that were running before the host rebooted - running_deleted_instance_action = log - (StrOpt) Action to take if a running deleted instance is detected.Valid options are 'noop', 'log' and 'reap'. Set to 'noop' to disable. + running_deleted_instance_action = reap + (StrOpt) 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. running_deleted_instance_poll_interval = 1800 diff --git a/doc/common/tables/nova-db.xml b/doc/common/tables/nova-db.xml index ade4c14f1e..3f4a535edf 100644 --- a/doc/common/tables/nova-db.xml +++ b/doc/common/tables/nova-db.xml @@ -20,20 +20,20 @@ (StrOpt) The backend to use for db - connection_trace = False - (BoolOpt) Add python stack traces to SQL as comment strings - - - connection = sqlite:////home/docwork/openstack-manuals-new/tools/autogenerate-config-docs/nova/nova/openstack/common/db/$sqlite_db + connection = sqlite:////usr/lib/python2.7/site-packages/nova/openstack/common/db/$sqlite_db (StrOpt) The SQLAlchemy connection string used to connect to the database connection_debug = 0 (IntOpt) Verbosity of SQL debugging information. 0=None, 100=Everything + + connection_trace = False + (BoolOpt) Add python stack traces to SQL as comment strings + db_backend = sqlalchemy - (StrOpt) The backend to use for bare-metal database.(This option is deprecated, please use backend instead.) + (StrOpt) The backend to use for bare-metal database db_check_interval = 60 @@ -47,14 +47,14 @@ idle_timeout = 3600 (IntOpt) timeout before idle sql connections are reaped - - max_pool_size = None - (IntOpt) Maximum number of SQL connections to keep open in a pool - max_overflow = None (IntOpt) If set, use this value for max_overflow with sqlalchemy + + max_pool_size = None + (IntOpt) Maximum number of SQL connections to keep open in a pool + max_retries = 10 (IntOpt) maximum db connection retries during startup. (setting -1 implies an infinite retry count) @@ -89,4 +89,4 @@ - + \ No newline at end of file diff --git a/doc/common/tables/nova-docker.xml b/doc/common/tables/nova-docker.xml index 003c31cc76..f82b32535d 100644 --- a/doc/common/tables/nova-docker.xml +++ b/doc/common/tables/nova-docker.xml @@ -16,7 +16,7 @@ - docker_registry_default_port = 5042 + registry_default_port = 5042 (IntOpt) Default TCP port to find the docker-registry container diff --git a/doc/common/tables/nova-ec2.xml b/doc/common/tables/nova-ec2.xml index 0f6213e533..e6c6ac8987 100644 --- a/doc/common/tables/nova-ec2.xml +++ b/doc/common/tables/nova-ec2.xml @@ -25,11 +25,11 @@ ec2_listen = 0.0.0.0 - (StrOpt) IP address for EC2 API to listen + (StrOpt) The IP address on which the EC2 API will listen. ec2_listen_port = 8773 - (IntOpt) port for ec2 api to listen + (IntOpt) The port on which the EC2 API will listen. ec2_path = /services/Cloud diff --git a/doc/common/tables/nova-hypervisor.xml b/doc/common/tables/nova-hypervisor.xml index 02834a95e7..d3431f73dd 100644 --- a/doc/common/tables/nova-hypervisor.xml +++ b/doc/common/tables/nova-hypervisor.xml @@ -19,138 +19,62 @@ block_migration_flag = VIR_MIGRATE_UNDEFINE_SOURCE, VIR_MIGRATE_PEER2PEER, VIR_MIGRATE_NON_SHARED_INC (StrOpt) Migration flags to be set for block migration - - checksum_base_images = False - (BoolOpt) Write a checksum for files in _base to disk - default_ephemeral_format = None (StrOpt) The default format an ephemeral_volume will be formatted with on creation. disk_cachemodes = - (ListOpt) Specific cachemodes to use for different disk types e.g: ["file=directsync","block=none"] + (ListOpt) Specific cachemodes to use for different disk types e.g: file=directsync,block=none force_raw_images = True (BoolOpt) Force backing images to raw format - inject_password = True - (BoolOpt) Whether baremetal compute injects password or not - - - libvirt_cpu_mode = None - (StrOpt) Set to "host-model" to clone the host CPU feature flags; to "host-passthrough" to use the host CPU model exactly; to "custom" to use a named CPU model; to "none" to not set any CPU model. If libvirt_type="kvm|qemu", it will default to "host-model", otherwise it will default to "none" - - - libvirt_cpu_model = None - (StrOpt) Set to a named libvirt CPU model (see names listed in /usr/share/libvirt/cpu_map.xml). Only has effect if libvirt_cpu_mode="custom" and libvirt_type="kvm|qemu" - - - libvirt_disk_prefix = None - (StrOpt) Override the default disk prefix for the devices attached to a server, which is dependent on libvirt_type. (valid options are: sd, xvd, uvd, vd) - - - libvirt_images_rbd_ceph_conf = + images_rbd_ceph_conf = (StrOpt) path to the ceph configuration file to use - libvirt_images_type = default - (StrOpt) 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. - - - libvirt_images_rbd_pool = rbd + images_rbd_pool = rbd (StrOpt) the RADOS pool in which rbd volumes are stored - libvirt_images_volume_group = None - (StrOpt) LVM Volume Group that is used for VM images, when you specify libvirt_images_type=lvm. + images_type = default + (StrOpt) 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. - libvirt_inject_key = True + images_volume_group = None + (StrOpt) LVM Volume Group that is used for VM images, when you specify images_type=lvm. + + + inject_key = True (BoolOpt) Inject the ssh public key at boot time - libvirt_inject_partition = 1 + inject_partition = 1 (IntOpt) The partition to inject to : -2 => disable, -1 => inspect (libguestfs only), 0 => not partitioned, >0 => partition number - libvirt_inject_password = False + inject_password = False (BoolOpt) Inject the admin password at boot time, without an agent. - libvirt_iscsi_use_multipath = False + iscsi_use_multipath = False (BoolOpt) use multipath connection of the iSCSI volume - libvirt_iser_use_multipath = False + iser_use_multipath = False (BoolOpt) use multipath connection of the iSER volume - libvirt_lvm_snapshot_size = 1000 + lvm_snapshot_size = 1000 (IntOpt) The amount of storage (in megabytes) to allocate for LVM snapshot copy-on-write blocks. - - libvirt_nonblocking = True - (BoolOpt) Use a separated OS thread pool to realize non-blocking libvirt calls - - - libvirt_snapshot_compression = False - (BoolOpt) Compress snapshot images when possible. This currently applies exclusively to qcow2 images - - - libvirt_snapshots_directory = $instances_path/snapshots - (StrOpt) Location where libvirt driver will store snapshots before uploading them to image service - - - libvirt_sparse_logical_volumes = False - (BoolOpt) Create sparse logical volumes (with virtualsize) if this flag is set to True. - - - libvirt_type = kvm - (StrOpt) Libvirt domain type (valid options are: kvm, lxc, qemu, uml, xen) - - - libvirt_uri = - (StrOpt) Override the default libvirt URI (which is dependent on libvirt_type) - - - libvirt_use_virtio_for_bridges = True - (BoolOpt) Use virtio for bridge interfaces with KVM/QEMU - - - libvirt_vif_driver = nova.virt.libvirt.vif.LibvirtGenericVIFDriver - (StrOpt) The libvirt VIF driver to configure the VIFs. - - - libvirt_volume_drivers = iscsi=nova.virt.libvirt.volume.LibvirtISCSIVolumeDriver, iser=nova.virt.libvirt.volume.LibvirtISERVolumeDriver, local=nova.virt.libvirt.volume.LibvirtVolumeDriver, fake=nova.virt.libvirt.volume.LibvirtFakeVolumeDriver, rbd=nova.virt.libvirt.volume.LibvirtNetVolumeDriver, sheepdog=nova.virt.libvirt.volume.LibvirtNetVolumeDriver, nfs=nova.virt.libvirt.volume.LibvirtNFSVolumeDriver, aoe=nova.virt.libvirt.volume.LibvirtAOEVolumeDriver, glusterfs=nova.virt.libvirt.volume.LibvirtGlusterfsVolumeDriver, fibre_channel=nova.virt.libvirt.volume.LibvirtFibreChannelVolumeDriver, scality=nova.virt.libvirt.volume.LibvirtScalityVolumeDriver - (ListOpt) Libvirt handlers for remote volumes. - - - libvirt_wait_soft_reboot_seconds = 120 - (IntOpt) 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. - preallocate_images = none (StrOpt) VM image preallocation mode: "none" => no storage provisioning is done up front, "space" => storage is fully allocated at instance start - - remove_unused_base_images = True - (BoolOpt) Should unused base images be removed? - - - remove_unused_kernels = False - (BoolOpt) Should unused kernel images be removed? This is only safe to enable if all compute nodes have been updated to support this option. This will enabled by default in future. - - - remove_unused_original_minimum_age_seconds = 86400 - (IntOpt) Unused unresized base images younger than this will not be removed - - - remove_unused_resized_minimum_age_seconds = 3600 - (IntOpt) Unused resized base images younger than this will not be removed - rescue_image_id = None (StrOpt) Rescue ami image @@ -167,10 +91,18 @@ rescue_timeout = 0 (IntOpt) Automatically unrescue an instance after N seconds. Set to 0 to disable. + + snapshot_compression = False + (BoolOpt) Compress snapshot images when possible. This currently applies exclusively to qcow2 images + snapshot_image_format = None (StrOpt) Snapshot image format (valid options are : raw, qcow2, vmdk, vdi). Defaults to same as source image + + sparse_logical_volumes = False + (BoolOpt) Create sparse logical volumes (with virtualsize) if this flag is set to True. + timeout_nbd = 10 (IntOpt) time to wait for a NBD device coming up @@ -183,14 +115,18 @@ use_usb_tablet = True (BoolOpt) Sync virtual and real mouse cursors in Windows VMs + + use_virtio_for_bridges = True + (BoolOpt) Use virtio for bridge interfaces with KVM/QEMU + vcpu_pin_set = None (StrOpt) Which pcpus can be used by vcpus of instance e.g: "4-12,^8,15" - virt_mkfs = ['default=mkfs.ext3 -L %(fs_label)s -F %(target)s', 'linux=mkfs.ext3 -L %(fs_label)s -F %(target)s', 'windows=mkfs.ntfs --force --fast --label %(fs_label)s %(target)s'] + virt_mkfs = [] (MultiStrOpt) mkfs commands for ephemeral device. The format is <os_type>=<mkfs command> - + \ No newline at end of file diff --git a/doc/common/tables/nova-ldap.xml b/doc/common/tables/nova-ldap.xml index 13a13cea56..57d8465230 100644 --- a/doc/common/tables/nova-ldap.xml +++ b/doc/common/tables/nova-ldap.xml @@ -16,7 +16,7 @@ - ldap_dns_base_dn = ou=hosts, dc=example, dc=org + ldap_dns_base_dn = ou=hosts,dc=example,dc=org (StrOpt) Base DN for DNS entries in ldap @@ -52,7 +52,7 @@ (StrOpt) URL for ldap server which will store dns entries - ldap_dns_user = uid=admin, ou=people, dc=example, dc=org + ldap_dns_user = uid=admin,ou=people,dc=example,dc=org (StrOpt) user for ldap DNS diff --git a/doc/common/tables/nova-logging.xml b/doc/common/tables/nova-logging.xml index f657e778e5..245c00ba6d 100644 --- a/doc/common/tables/nova-logging.xml +++ b/doc/common/tables/nova-logging.xml @@ -20,7 +20,7 @@ (BoolOpt) Print debugging output (set logging level to DEBUG instead of default WARNING level). - default_log_levels = amqplib=WARN, sqlalchemy=WARN, boto=WARN, suds=INFO, keystone=INFO, eventlet.wsgi.server=WARN + default_log_levels = amqp=WARN, amqplib=WARN, boto=WARN, keystone=INFO, qpid=WARN, sqlalchemy=WARN, suds=INFO, iso8601=WARN (ListOpt) list of logger=LEVEL pairs @@ -32,16 +32,16 @@ (BoolOpt) make exception message format errors fatal - instance_format = [instance: %(uuid)s] + instance_format = [instance: %(uuid)s] (StrOpt) If an instance is passed with the log message, format it like this - instance_uuid_format = [instance: %(uuid)s] + instance_uuid_format = [instance: %(uuid)s] (StrOpt) If an instance UUID is passed with the log message, format it like this - log_config = None - (StrOpt) If this option is specified, the logging configuration file specified is used and overrides any other logging options specified. Please see the Python logging module documentation for details on logging configuration files. + log_config_append = None + (StrOpt) 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. log_date_format = %Y-%m-%d %H:%M:%S @@ -97,4 +97,4 @@ - \ No newline at end of file + diff --git a/doc/common/tables/nova-metadata.xml b/doc/common/tables/nova-metadata.xml index 3d76052eec..a47030a1a9 100644 --- a/doc/common/tables/nova-metadata.xml +++ b/doc/common/tables/nova-metadata.xml @@ -21,11 +21,11 @@ metadata_listen = 0.0.0.0 - (StrOpt) IP address for metadata api to listen + (StrOpt) The IP address on which the metadata API will listen. metadata_listen_port = 8775 - (IntOpt) port for metadata api to listen + (IntOpt) The port on which the metadata API will listen. metadata_manager = nova.api.manager.MetadataManager @@ -45,7 +45,7 @@ vendordata_jsonfile_path = None - (StrOpt) File to load json formated vendor data from + (StrOpt) File to load json formatted vendor data from diff --git a/doc/common/tables/nova-network.xml b/doc/common/tables/nova-network.xml index be61ff1351..d1b5f28d16 100644 --- a/doc/common/tables/nova-network.xml +++ b/doc/common/tables/nova-network.xml @@ -87,11 +87,6 @@ flat_interface = None (StrOpt) FlatDhcp will bridge into this interface if set - - ovs_vsctl_timeout = 120 - (IntOpt) Amount of time, in seconds, that ovs_vsctl should wait for aresponse from the database. 0 is to wait forever. - - flat_network_bridge = None (StrOpt) Bridge for simple network instances @@ -124,18 +119,10 @@ injected_network_template = $pybasedir/nova/virt/interfaces.template (StrOpt) Template file for injected network - - injected_network_template = $pybasedir/nova/virt/baremetal/interfaces.template - (StrOpt) Template file for injected network - injected_network_template = $pybasedir/nova/virt/interfaces.template (StrOpt) Template file for injected network - - injected_network_template = $pybasedir/nova/virt/baremetal/interfaces.template - (StrOpt) Template file for injected network - instance_dns_domain = (StrOpt) full class name for the DNS Zone for instance IPs @@ -146,7 +133,7 @@ iptables_bottom_regex = - (StrOpt) Regular expression to match iptables rule that shouldalways be on the bottom. + (StrOpt) Regular expression to match iptables rule that should always be on the bottom. iptables_drop_action = DROP @@ -154,7 +141,7 @@ iptables_top_regex = - (StrOpt) Regular expression to match iptables rule that shouldalways be on the top. + (StrOpt) Regular expression to match iptables rule that should always be on the top. l3_lib = nova.network.l3.LinuxNetL3 @@ -182,7 +169,7 @@ network_device_mtu = None - (StrOpt) MTU setting for vlan + (IntOpt) MTU setting for network interface network_driver = nova.network.linux_net @@ -208,6 +195,10 @@ num_networks = 1 (IntOpt) Number of networks to support + + ovs_vsctl_timeout = 120 + (IntOpt) Amount of time, in seconds, that ovs_vsctl should wait for a response from the database. 0 is to wait forever. + public_interface = eth0 (StrOpt) Interface for public IP addresses @@ -266,4 +257,4 @@ - + \ No newline at end of file diff --git a/doc/common/tables/nova-neutron.xml b/doc/common/tables/nova-neutron.xml index a48ba86f46..7e7df43627 100644 --- a/doc/common/tables/nova-neutron.xml +++ b/doc/common/tables/nova-neutron.xml @@ -15,10 +15,6 @@ - - dhcp_options_enabled = False - (BoolOpt) Use per-port DHCP options with Neutron - neutron_admin_auth_url = http://localhost:5000/v2.0 (StrOpt) auth url for connecting to neutron in admin context @@ -45,7 +41,7 @@ neutron_ca_certificates_file = None - (StrOpt) Location of ca certicates file to use for neutronclient requests. + (StrOpt) Location of ca certificates file to use for neutron client requests. neutron_default_tenant_id = default diff --git a/doc/common/tables/nova-policy.xml b/doc/common/tables/nova-policy.xml index 00e481729c..f1d1c62d90 100644 --- a/doc/common/tables/nova-policy.xml +++ b/doc/common/tables/nova-policy.xml @@ -64,7 +64,7 @@ (IntOpt) number of seconds until a reservation expires - resize_fs_using_block_device = True + resize_fs_using_block_device = False (BoolOpt) Attempt to resize the filesystem by accessing the image over a block device. This is done by the host and may not be necessary if the image contains a recent version of cloud-init. Possible mechanisms require the nbd driver (for qcow and raw), or loop (for raw). diff --git a/doc/common/tables/nova-powervm.xml b/doc/common/tables/nova-powervm.xml deleted file mode 100644 index 67a1f283c5..0000000000 --- a/doc/common/tables/nova-powervm.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Description of configuration options for powervm
Configuration option = Default valueDescription
powervm_img_local_path = /tmp(StrOpt) Local directory to download glance images to. Make sure this path can fit your biggest image in glance
powervm_img_remote_path = /home/padmin(StrOpt) PowerVM image remote path where images will be moved. Make sure this path can fit your biggest image in glance
powervm_mgr = None(StrOpt) PowerVM manager host or ip
powervm_mgr_passwd = None(StrOpt) PowerVM manager user password
powervm_mgr_type = ivm(StrOpt) PowerVM manager type (ivm, hmc)
powervm_mgr_user = None(StrOpt) PowerVM manager user name
- \ No newline at end of file diff --git a/doc/common/tables/nova-quota.xml b/doc/common/tables/nova-quota.xml index 1ec21f35f9..fa1f038411 100644 --- a/doc/common/tables/nova-quota.xml +++ b/doc/common/tables/nova-quota.xml @@ -25,7 +25,7 @@ enable_network_quota = False - (BoolOpt) Enables or disables quotaing of tenant networks + (BoolOpt) Enables or disables quota checking for tenant networks quota_cores = 20 diff --git a/doc/common/tables/nova-redis.xml b/doc/common/tables/nova-redis.xml index b622191408..6d91e60d36 100644 --- a/doc/common/tables/nova-redis.xml +++ b/doc/common/tables/nova-redis.xml @@ -23,6 +23,10 @@ host = 127.0.0.1 (StrOpt) Host to locate redis + + host = None + (StrOpt) 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. + password = None (StrOpt) Password for Redis server. (optional) @@ -31,6 +35,10 @@ port = 6379 (IntOpt) Use this port to connect to redis host. + + port = None + (IntOpt) 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. + \ No newline at end of file diff --git a/doc/common/tables/nova-rpc.xml b/doc/common/tables/nova-rpc.xml index d04052c88f..044f065011 100644 --- a/doc/common/tables/nova-rpc.xml +++ b/doc/common/tables/nova-rpc.xml @@ -15,14 +15,14 @@ - - amqp_durable_queues = False - (BoolOpt) Use durable queues in amqp. - amqp_auto_delete = False (BoolOpt) Auto-delete queues in amqp. + + amqp_durable_queues = False + (BoolOpt) Use durable queues in amqp. + baseapi = None (StrOpt) Set a version cap for messages sent to the base api in any service diff --git a/doc/common/tables/nova-scheduling.xml b/doc/common/tables/nova-scheduling.xml index 3c65be675f..f14e15f322 100644 --- a/doc/common/tables/nova-scheduling.xml +++ b/doc/common/tables/nova-scheduling.xml @@ -15,6 +15,14 @@ + + aggregate_image_properties_isolation_namespace = None + (StrOpt) Force the filter to consider only keys matching the given namespace. + + + aggregate_image_properties_isolation_separator = . + (StrOpt) The separator used between the namespace and keys + cpu_allocation_ratio = 16.0 (FloatOpt) Virtual CPU to physical CPU allocation ratio which affects all CPU filters. This configuration specifies a global ratio for CoreFilter. For AggregateCoreFilter, it will fall back to this configuration value if no per-aggregate setting found. @@ -119,6 +127,14 @@ scheduler_weight_classes = nova.scheduler.weights.all_weighers (ListOpt) Which weight class names to use for weighing hosts + + weight_multiplier = 1.0 + (FloatOpt) Multiplier used for weighing metrics. + + + weight_setting = + (ListOpt) How the metrics are going to be weighed. This should be in the form of "<name1>=<ratio1>, <name2>=<ratio2>, ...", where <nameX> is one of the metric to be weighed, and <ratioX> is the corresponding ratio. So for "name1=1.0, name2=-1.0" The final weight would be name1.value * 1.0 + name2.value * -1.0. + \ No newline at end of file diff --git a/doc/common/tables/nova-vmware.xml b/doc/common/tables/nova-vmware.xml index 3f6b77d18f..d14cf8c625 100644 --- a/doc/common/tables/nova-vmware.xml +++ b/doc/common/tables/nova-vmware.xml @@ -17,7 +17,7 @@ api_retry_count = 10 - (IntOpt) The number of times we retry on failures, e.g., socket error, etc. Used only if compute_driver is vmwareapi.VMwareESXDriver or vmwareapi.VMwareVCDriver. + (IntOpt) The number of times we retry on failures, e.g., socket error, etc. cluster_name = None @@ -29,15 +29,15 @@ host_ip = None - (StrOpt) URL for connection to VMware ESX/VC host. Required if compute_driver is vmwareapi.VMwareESXDriver or vmwareapi.VMwareVCDriver. - - - host_username = None - (StrOpt) Username for connection to VMware ESX/VC host. Used only if compute_driver is vmwareapi.VMwareESXDriver or vmwareapi.VMwareVCDriver. + (StrOpt) URL for connection to VMware ESX/VC host. host_password = None - (StrOpt) Password for connection to VMware ESX/VC host. Used only if compute_driver is vmwareapi.VMwareESXDriver or vmwareapi.VMwareVCDriver. + (StrOpt) Password for connection to VMware ESX/VC host. + + + host_username = None + (StrOpt) Username for connection to VMware ESX/VC host. integration_bridge = br-int @@ -49,7 +49,7 @@ task_poll_interval = 5.0 - (FloatOpt) The interval used for polling of remote tasks. Used only if compute_driver is vmwareapi.VMwareESXDriver or vmwareapi.VMwareVCDriver. + (FloatOpt) The interval used for polling of remote tasks. use_linked_clone = True diff --git a/doc/common/tables/nova-vnc.xml b/doc/common/tables/nova-vnc.xml index d809a0ddc5..7e05a80409 100644 --- a/doc/common/tables/nova-vnc.xml +++ b/doc/common/tables/nova-vnc.xml @@ -27,10 +27,6 @@ vnc_keymap = en-us (StrOpt) keymap for vnc - - vnc_password = None - (StrOpt) VNC password - vnc_port = 5900 (IntOpt) VNC starting port diff --git a/doc/common/tables/nova-volumes.xml b/doc/common/tables/nova-volumes.xml index d8a072c18b..4083f778b5 100644 --- a/doc/common/tables/nova-volumes.xml +++ b/doc/common/tables/nova-volumes.xml @@ -25,7 +25,7 @@ cinder_ca_certificates_file = None - (StrOpt) Location of ca certicates file to use for cinder client requests. + (StrOpt) Location of ca certificates file to use for cinder client requests. cinder_catalog_info = volume:cinder:publicURL @@ -67,6 +67,10 @@ num_aoe_discover_tries = 3 (IntOpt) number of times to rediscover AoE target to find volume + + num_iscsi_scan_tries = 3 + (IntOpt) number of times to rescan iSCSI target to find volume + num_iser_scan_tries = 3 (IntOpt) number of times to rescan iSER target to find volume @@ -117,4 +121,4 @@ - + \ No newline at end of file diff --git a/doc/common/tables/nova-wsgi.xml b/doc/common/tables/nova-wsgi.xml index 7dfffff87a..3579e9bc42 100644 --- a/doc/common/tables/nova-wsgi.xml +++ b/doc/common/tables/nova-wsgi.xml @@ -35,6 +35,10 @@ tcp_keepidle = 600 (IntOpt) Sets the value of TCP_KEEPIDLE in seconds for each server socket. Not supported on OS X. + + wsgi_default_pool_size = 1000 + (IntOpt) Size of the pool of greenthreads used by wsgi + wsgi_log_format = %(client_ip)s "%(request_line)s" status: %(status_code)s len: %(body_length)s time: %(wall_seconds).7f (StrOpt) A python format string that is used as the template to generate log lines. The following values can be formatted into it: client_ip, date_time, request_line, status_code, body_length, wall_seconds. diff --git a/doc/common/tables/nova-xen.xml b/doc/common/tables/nova-xen.xml index d604d9d7d4..c91fe1956e 100644 --- a/doc/common/tables/nova-xen.xml +++ b/doc/common/tables/nova-xen.xml @@ -15,6 +15,10 @@ + + agent_path = usr/sbin/xe-update-networking + (StrOpt) 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 + agent_resetnetwork_timeout = 60 (IntOpt) number of seconds to wait for agent reply to resetnetwork request @@ -31,6 +35,26 @@ cache_images = all (StrOpt) 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 + + check_host = True + (BoolOpt) Ensure compute service is running on host XenAPI connects to. + + + connection_concurrent = 5 + (IntOpt) Maximum number of concurrent XenAPI connections. Used only if compute_driver=xenapi.XenAPIDriver + + + connection_password = None + (StrOpt) Password for connection to XenServer/Xen Cloud Platform. Used only if compute_driver=xenapi.XenAPIDriver + + + connection_url = None + (StrOpt) 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 + + + connection_username = root + (StrOpt) Username for connection to XenServer/Xen Cloud Platform. Used only if compute_driver=xenapi.XenAPIDriver + console_driver = nova.console.xvp.XVPConsoleProxy (StrOpt) Driver to use for the console proxy @@ -67,14 +91,70 @@ default_os_type = linux (StrOpt) Default OS type + + disable_agent = False + (BoolOpt) Disables the use of the XenAPI agent in any image regardless of what image properties are present. + + + image_compression_level = None + (IntOpt) Compression level for images, e.g., 9 for gzip -9. Range is 1-9, 9 being most compressed but most CPU intensive on dom0. + + + image_upload_handler = nova.virt.xenapi.image.glance.GlanceStore + (StrOpt) Dom0 plugin driver used to handle image uploads. + + + ipxe_boot_menu_url = None + (StrOpt) URL to the iPXE boot menu + + + ipxe_mkisofs_cmd = mkisofs + (StrOpt) Name and optionally path of the tool used for ISO image creation + + + ipxe_network_name = None + (StrOpt) Name of network to use for booting iPXE ISOs + iqn_prefix = iqn.2010-10.org.openstack (StrOpt) IQN Prefix + + login_timeout = 10 + (IntOpt) Timeout in seconds for XenAPI login. + max_kernel_ramdisk_size = 16777216 (IntOpt) Maximum size in bytes of kernel or ramdisk images + + num_vbd_unplug_retries = 10 + (IntOpt) Maximum number of retries to unplug VBD + + + ovs_integration_bridge = xapi1 + (StrOpt) Name of Integration Bridge used by Open vSwitch + + + remap_vbd_dev = False + (BoolOpt) Used to enable the remapping of VBD dev (Works around an issue in Ubuntu Maverick) + + + remap_vbd_dev_prefix = sd + (StrOpt) Specify prefix to remap VBD dev to (ex. /dev/xvdb -> /dev/sdb) + + + running_timeout = 60 + (IntOpt) number of seconds to wait for instance to go to running state + + + sparse_copy = True + (BoolOpt) 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 + + + sr_base_path = /var/run/sr-mount + (StrOpt) Base path to the storage repository + sr_matching_filter = default-sr:true (StrOpt) 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 @@ -91,146 +171,62 @@ target_port = 3260 (StrOpt) iSCSI Target Port, 3260 Default + + torrent_base_url = None + (StrOpt) Base URL for torrent files. + + + torrent_download_stall_cutoff = 600 + (IntOpt) Number of seconds a download can remain at the same progress percentage w/o being considered a stall + + + torrent_images = none + (StrOpt) Whether or not to download images via Bit Torrent (all|some|none). + + + torrent_listen_port_end = 6891 + (IntOpt) End of port range to listen on + + + torrent_listen_port_start = 6881 + (IntOpt) Beginning of port range to listen on + + + torrent_max_last_accessed = 86400 + (IntOpt) Cached torrent files not accessed within this number of seconds can be reaped + + + torrent_max_seeder_processes_per_host = 1 + (IntOpt) Maximum number of seeder processes to run concurrently within a given dom0. (-1 = no limit) + + + torrent_seed_chance = 1.0 + (FloatOpt) Probability that peer will become a seeder. (1.0 = 100%) + + + torrent_seed_duration = 3600 + (IntOpt) Number of seconds after downloading an image via BitTorrent that it should be seeded for other peers. + + + use_agent_default = False + (BoolOpt) 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. + use_join_force = True (BoolOpt) To use for hosts with different CPUs + + vhd_coalesce_max_attempts = 5 + (IntOpt) Max number of times to poll for VHD to coalesce. Used only if compute_driver=xenapi.XenAPIDriver + + + vhd_coalesce_poll_interval = 5.0 + (FloatOpt) The interval used for polling of coalescing vhds. Used only if compute_driver=xenapi.XenAPIDriver + xen_hvmloader_path = /usr/lib/xen/boot/hvmloader (StrOpt) Location where the Xen hvmloader is kept - - xenapi_agent_path = usr/sbin/xe-update-networking - (StrOpt) 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 - - - xenapi_check_host = True - (BoolOpt) Ensure compute service is running on host XenAPI connects to. - - - xenapi_connection_concurrent = 5 - (IntOpt) Maximum number of concurrent XenAPI connections. Used only if compute_driver=xenapi.XenAPIDriver - - - xenapi_connection_password = None - (StrOpt) Password for connection to XenServer/Xen Cloud Platform. Used only if compute_driver=xenapi.XenAPIDriver - - - xenapi_connection_url = None - (StrOpt) 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 - - - xenapi_connection_username = root - (StrOpt) Username for connection to XenServer/Xen Cloud Platform. Used only if compute_driver=xenapi.XenAPIDriver - - - xenapi_disable_agent = False - (BoolOpt) Disables the use of the XenAPI agent in any image regardless of what image properties are present. - - - xenapi_image_compression_level = None - (IntOpt) Compression level for images, e.g., 9 for gzip -9. Range is 1-9, 9 being most compressed but most CPU intensive on dom0. - - - xenapi_image_upload_handler = nova.virt.xenapi.image.glance.GlanceStore - (StrOpt) Dom0 plugin driver used to handle image uploads. - - - xenapi_ipxe_boot_menu_url = None - (StrOpt) URL to the iPXE boot menu - - - xenapi_login_timeout = 10 - (IntOpt) Timeout in seconds for XenAPI login. - - - xenapi_ipxe_mkisofs_cmd = mkisofs - (StrOpt) Name and optionally path of the tool used for ISO image creation - - - xenapi_num_vbd_unplug_retries = 10 - (IntOpt) Maximum number of retries to unplug VBD - - - xenapi_ipxe_network_name = None - (StrOpt) Name of network to use for booting iPXE ISOs - - - xenapi_ovs_integration_bridge = xapi1 - (StrOpt) Name of Integration Bridge used by Open vSwitch - - - xenapi_remap_vbd_dev = False - (BoolOpt) Used to enable the remapping of VBD dev (Works around an issue in Ubuntu Maverick) - - - xenapi_remap_vbd_dev_prefix = sd - (StrOpt) Specify prefix to remap VBD dev to (ex. /dev/xvdb -> /dev/sdb) - - - xenapi_running_timeout = 60 - (IntOpt) number of seconds to wait for instance to go to running state - - - xenapi_sparse_copy = True - (BoolOpt) 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 - - - xenapi_sr_base_path = /var/run/sr-mount - (StrOpt) Base path to the storage repository - - - xenapi_torrent_base_url = None - (StrOpt) Base URL for torrent files. - - - xenapi_torrent_download_stall_cutoff = 600 - (IntOpt) Number of seconds a download can remain at the same progress percentage w/o being considered a stall - - - xenapi_torrent_images = none - (StrOpt) Whether or not to download images via Bit Torrent (all|some|none). - - - xenapi_torrent_listen_port_end = 6891 - (IntOpt) End of port range to listen on - - - xenapi_torrent_listen_port_start = 6881 - (IntOpt) Beginning of port range to listen on - - - xenapi_torrent_max_last_accessed = 86400 - (IntOpt) Cached torrent files not accessed within this number of seconds can be reaped - - - xenapi_torrent_max_seeder_processes_per_host = 1 - (IntOpt) Maximum number of seeder processes to run concurrently within a given dom0. (-1 = no limit) - - - xenapi_torrent_seed_chance = 1.0 - (FloatOpt) Probability that peer will become a seeder. (1.0 = 100%) - - - xenapi_torrent_seed_duration = 3600 - (IntOpt) Number of seconds after downloading an image via BitTorrent that it should be seeded for other peers. - - - xenapi_use_agent_default = False - (BoolOpt) 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. - - - xenapi_vhd_coalesce_max_attempts = 5 - (IntOpt) Max number of times to poll for VHD to coalesce. Used only if compute_driver=xenapi.XenAPIDriver - - - xenapi_vhd_coalesce_poll_interval = 5.0 - (FloatOpt) The interval used for polling of coalescing vhds. Used only if compute_driver=xenapi.XenAPIDriver - - - xenapi_vif_driver = nova.virt.xenapi.vif.XenAPIBridgeDriver - (StrOpt) The XenAPI VIF driver using XenServer Network APIs. - \ No newline at end of file diff --git a/doc/config-reference/compute/section_compute-hypervisors.xml b/doc/config-reference/compute/section_compute-hypervisors.xml index 1dc5493097..67d432c560 100644 --- a/doc/config-reference/compute/section_compute-hypervisors.xml +++ b/doc/config-reference/compute/section_compute-hypervisors.xml @@ -62,13 +62,6 @@ >nova-compute service in a para-virtualized VM. - - PowerVM - Server virtualization with IBM - PowerVM, use to run AIX, IBM i and Linux environments - on IBM POWER technology. - - diff --git a/doc/config-reference/compute/section_compute-options-reference.xml b/doc/config-reference/compute/section_compute-options-reference.xml index 3c5b74eecd..d6cc3e8aa8 100644 --- a/doc/config-reference/compute/section_compute-options-reference.xml +++ b/doc/config-reference/compute/section_compute-options-reference.xml @@ -37,7 +37,6 @@ - diff --git a/doc/config-reference/compute/section_hypervisor_powervm.xml b/doc/config-reference/compute/section_hypervisor_powervm.xml deleted file mode 100644 index 1e5aaa232d..0000000000 --- a/doc/config-reference/compute/section_hypervisor_powervm.xml +++ /dev/null @@ -1,50 +0,0 @@ - -
- PowerVM - -
- Introduction - PowerVM driver removed - - Due to a change in strategic direction at IBM, the PowerVM driver - has been removed from OpenStack Compute. It will be replaced by - a driver using PowerVC in the future. - - - PowerVM compute driver connects to an Integrated Virtualization - Manager (IVM) to perform PowerVM Logical Partition (LPAR) - deployment and management. The driver supports file-based deployment - using images from the OpenStack Image Service. - Hardware Management Console (HMC) is not yet supported. - For more detailed information about PowerVM Virtualization system, - refer to the IBM Redbook publication: - - IBM PowerVM Virtualization Introduction and Configuration. -
-
- Configuration - To enable the PowerVM compute driver, add the following configuration - options /etc/nova/nova.conf: - compute_driver=nova.virt.powervm.PowerVMDriver -powervm_mgr_type=ivm -powervm_mgr=powervm_hostname_or_ip_address -powervm_mgr_user=padmin -powervm_mgr_passwd=padmin_user_password -powervm_img_remote_path=/path/to/remote/image/directory -powervm_img_local_path=/path/to/local/image/directory/on/compute/host - - -
-
- Limitations - - PowerVM LPARs names have a limit of 31 characters. Since OpenStack Compute instance names - are mapped to LPAR names in Power Systems, make sure - instance_name_template - config option in nova.conf yields names that have 31 or fewer characters. - -
-
diff --git a/tools/autogenerate-config-flagmappings/nova.flagmappings b/tools/autogenerate-config-flagmappings/nova.flagmappings index eeee737e3b..e6c3bc5ede 100644 --- a/tools/autogenerate-config-flagmappings/nova.flagmappings +++ b/tools/autogenerate-config-flagmappings/nova.flagmappings @@ -1,18 +1,22 @@ address zookeeper agent_enabled spice +agent_path xen agent_resetnetwork_timeout xen agent_timeout xen agent_version_timeout xen +aggregate_image_properties_isolation_namespace scheduling +aggregate_image_properties_isolation_separator scheduling allow_instance_snapshots policy allow_migrate_to_same_host policy allow_resize_to_same_host policy allow_same_net_traffic network allowed_direct_url_schemes glance allowed_rpc_exception_modules testing +amqp_auto_delete rpc amqp_durable_queues rpc +api_audit_map common api_class keymgr api_paste_config wsgi -amqp_auto_delete rpc api_rate_limit authentication api_retry_count vmware attestation_api_url trustedcomputing @@ -27,7 +31,6 @@ backdoor_port testing backend db bandwidth_poll_interval quota bandwidth_update_interval quota -base_dir_name compute baseapi rpc bindir common block_device_creation_timeout volumes @@ -46,6 +49,7 @@ cert upgrade_levels cert_file ca cert_manager ca cert_topic ca +check_host xen checksum_base_images libvirt checksum_interval_seconds libvirt cinder_api_insecure volumes @@ -57,9 +61,10 @@ cinder_http_retries volumes cluster_name vmware cnt_vpn_clients network compute upgrade_levels -compute_api_class compute +compute_available_monitors compute compute_driver compute compute_manager compute +compute_monitors compute compute_stats_class compute compute_topic common conductor upgrade_levels @@ -68,12 +73,16 @@ config_drive_format configdrive config_drive_inject_password configdrive config_drive_skip_versions configdrive config_drive_tempdir configdrive -connection_trace db -console upgrade_levels connection db -conn_uri libvirt -console_driver xen +connection_concurrent xen connection_debug db +connection_password xen +connection_trace db +connection_uri libvirt +connection_url xen +connection_username xen +console upgrade_levels +console_driver xen console_host compute console_manager compute console_public_hostname console @@ -91,6 +100,8 @@ consoleauth_manager console consoleauth_topic common control_exchange rpc cpu_allocation_ratio scheduling +cpu_mode libvirt +cpu_model libvirt create_unique_mac_address_attempts network crl_file ca datastore_regex vmware @@ -114,12 +125,13 @@ deploy_kernel baremetal deploy_ramdisk baremetal dhcp_domain network dhcp_lease_time network -dhcp_options_enabled neutron dhcpbridge network dhcpbridge_flagfile network +disable_agent xen disable_process_locking common disk_allocation_ratio scheduling disk_cachemodes hypervisor +disk_prefix libvirt dmz_cidr vpn dmz_mask vpn dmz_net vpn @@ -188,14 +200,23 @@ heal_instance_info_cache_interval compute host common host redis host_ip vmware +host_password vmware host_state_interval compute host_username vmware html5proxy_base_url spice idle_timeout db image_cache_manager_interval compute -host_password vmware +image_cache_subdirectory_name compute +image_compression_level xen image_decryption_dir s3 image_info_filename_pattern libvirt +image_upload_handler xen +images_rbd_ceph_conf hypervisor +images_rbd_pool hypervisor +images_type hypervisor +images_volume_group hypervisor +inject_key hypervisor +inject_partition hypervisor inject_password hypervisor injected_network_template network injected_network_template network @@ -220,8 +241,13 @@ iptables_bottom_regex network iptables_drop_action network iptables_top_regex network ipv6_backend ipv6 +ipxe_boot_menu_url xen +ipxe_mkisofs_cmd xen +ipxe_network_name xen iqn_prefix xen iscsi_iqn_prefix volumes +iscsi_use_multipath hypervisor +iser_use_multipath hypervisor isolated_hosts scheduling isolated_images scheduling key_file ca @@ -243,27 +269,6 @@ ldap_dns_soa_refresh ldap ldap_dns_soa_retry ldap ldap_dns_url ldap ldap_dns_user ldap -libvirt_cpu_mode libvirt -libvirt_cpu_model libvirt -libvirt_disk_prefix libvirt -libvirt_images_rbd_ceph_conf hypervisor -libvirt_images_type hypervisor -libvirt_images_rbd_pool hypervisor -libvirt_images_volume_group hypervisor -libvirt_inject_key libvirt -libvirt_inject_partition libvirt -libvirt_inject_password libvirt -libvirt_iscsi_use_multipath hypervisor -libvirt_iser_use_multipath hypervisor -libvirt_lvm_snapshot_size hypervisor -libvirt_non_blocking libvirt -libvirt_snapshot_compression hypervisor -libvirt_snapshots_directory libvirt -libvirt_sparse_logical_volumes hypervisor -libvirt_use_virtio_for_bridges hypervisor -libvirt_vif_driver libvirt -libvirt_volume_drivers libvirt -libvirt_wait_soft_reboot_seconds libvirt limit_cpu_features hyperv linuxnet_interface_driver network linuxnet_ovs_integration_bridge network @@ -275,7 +280,7 @@ lock_path common lockout_attempts ec2 lockout_minutes ec2 lockout_window ec2 -log_config logging +log_config_append logging log_date_format logging log_dir logging log_file logging @@ -284,6 +289,8 @@ logging_context_format_string logging logging_debug_format_suffix logging logging_default_format_string logging logging_exception_prefix logging +login_timeout xen +lvm_snapshot_size hypervisor manager cells manager conductor matchmaker_heartbeat_freq rpc @@ -294,15 +301,15 @@ max_instances_per_host scheduling max_io_ops_per_host scheduling max_kernel_ramdisk_size xen max_local_block_devices policy -max_pool_size db -memcached_servers common max_overflow db -metadata_host metadata +max_pool_size db max_retries db -metadata_listen metadata -maximum_objects vmware -metadata_listen_port metadata maximum_instance_delete_attempts compute +maximum_objects vmware +memcached_servers common +metadata_host metadata +metadata_listen metadata +metadata_listen_port metadata metadata_manager metadata metadata_port metadata metadata_workers metadata @@ -318,6 +325,7 @@ mute_weight_multiplier cells mute_weight_value cells my_ip common name cells +namespace common net_config_template baremetal network upgrade_levels network_allocate_retries network @@ -352,8 +360,11 @@ notify_on_state_change common novncproxy_base_url vnc null_kernel api num_aoe_discover_tries volumes +num_iscsi_scan_tries volumes num_iser_scan_tries volumes num_networks network +num_vbd_unplug_retries xen +offset_weight_multiplier cells os_region_name volumes osapi_compute_ext_list api osapi_compute_extension api @@ -366,6 +377,7 @@ osapi_glance_link_prefix glance osapi_hide_server_address_states api osapi_max_limit policy osapi_max_request_body_size policy +ovs_integration_bridge xen ovs_vsctl_timeout network password redis password_length policy @@ -378,12 +390,6 @@ policy_file policy pool_timeout db port redis power_manager baremetal -powervm_img_local_path powervm -powervm_img_remote_path powervm -powervm_mgr powervm -powervm_mgr_passwd powervm -powervm_mgr_type powervm -powervm_mgr_user powervm preallocate_images hypervisor project_cert_subject ca public_interface network @@ -439,6 +445,8 @@ reclaim_instance_interval compute recv_timeout zookeeper region_list ec2 registry_default_port docker +remap_vbd_dev xen +remap_vbd_dev_prefix xen remove_unused_base_images libvirt remove_unused_kernels libvirt remove_unused_original_minimum_age_seconds libvirt @@ -453,9 +461,9 @@ reserve_percent cells reserved_host_disk_mb scheduling reserved_host_memory_mb scheduling resize_confirm_window compute +resize_fs_using_block_device policy restrict_isolated_hosts_to_isolated_images scheduling resume_guests_state_on_host_boot compute -resize_fs_using_block_device policy retry_interval db ringfile rpc rootwrap_config common @@ -477,6 +485,7 @@ run_external_periodic_tasks periodic running_deleted_instance_action compute running_deleted_instance_poll_interval compute running_deleted_instance_timeout compute +running_timeout xen s3_access_key s3 s3_affix_tenant s3 s3_host s3 @@ -515,12 +524,17 @@ share_dhcp_address network shelved_offload_time compute shelved_poll_interval compute slave_connection db +snapshot_compression hypervisor snapshot_image_format hypervisor snapshot_name_template api +snapshots_directory libvirt +sparse_copy xen +sparse_logical_volumes hypervisor sql_connection baremetal sql_connection db sqlite_db db sqlite_synchronous db +sr_base_path xen sr_matching_filter xen ssl_ca_file wsgi ssl_cert_file wsgi @@ -549,9 +563,20 @@ timeout_nbd hypervisor topic cells topic conductor topics rpc +torrent_base_url xen +torrent_download_stall_cutoff xen +torrent_images xen +torrent_listen_port_end xen +torrent_listen_port_start xen +torrent_max_last_accessed xen +torrent_max_seeder_processes_per_host xen +torrent_seed_chance xen +torrent_seed_duration xen until_refresh policy update_dns_entries network +use_agent_default xen use_cow_images hypervisor +use_file_injection baremetal use_forwarded_for api use_ipv6 ipv6 use_join_force xen @@ -566,11 +591,14 @@ use_syslog logging use_tpool api use_unsafe_iscsi baremetal use_usb_tablet hypervisor +use_virtio_for_bridges hypervisor user_cert_subject ca vcpu_pin_set hypervisor vendordata_driver metadata -verbose logging vendordata_jsonfile_path metadata +verbose logging +vhd_coalesce_max_attempts xen +vhd_coalesce_poll_interval xen vif_driver baremetal virt_mkfs hypervisor virt_type libvirt @@ -584,7 +612,6 @@ vlan_interface network vlan_start network vnc_enabled vnc vnc_keymap vnc -vnc_password vnc vnc_port vnc vnc_port_total vnc vncserver_listen vnc @@ -593,6 +620,7 @@ volume_api_class volumes volume_attach_retry_count volumes volume_attach_retry_interval volumes volume_driver volumes +volume_drivers libvirt volume_usage_poll_interval volumes vpn_flavor vpn vpn_image_id vpn @@ -600,43 +628,14 @@ vpn_ip vpn vpn_key_suffix vpn vpn_start vpn vswitch_name hyperv +wait_soft_reboot_seconds libvirt +weight_multiplier scheduling +weight_setting scheduling workers conductor wsdl_location vmware +wsgi_default_pool_size wsgi wsgi_log_format wsgi xen_hvmloader_path xen -xenapi_agent_path xen -xenapi_check_host xen -xenapi_connection_concurrent xen -xenapi_connection_password xen -xenapi_connection_url xen -xenapi_connection_username xen -xenapi_disable_agent xen -xenapi_image_compression_level xen -xenapi_image_upload_handler xen -xenapi_ipxe_boot_menu_url xen -xenapi_login_timeout xen -xenapi_ipxe_mkisofs_cmd xen -xenapi_num_vbd_unplug_retries xen -xenapi_ipxe_network_name xen -xenapi_ovs_integration_bridge xen -xenapi_remap_vbd_dev xen -xenapi_remap_vbd_dev_prefix xen -xenapi_running_timeout xen -xenapi_sparse_copy xen -xenapi_sr_base_path xen -xenapi_torrent_base_url xen -xenapi_torrent_download_stall_cutoff xen -xenapi_torrent_images xen -xenapi_torrent_listen_port_end xen -xenapi_torrent_listen_port_start xen -xenapi_torrent_max_last_accessed xen -xenapi_torrent_max_seeder_processes_per_host xen -xenapi_torrent_seed_chance xen -xenapi_torrent_seed_duration xen -xenapi_use_agent_default xen -xenapi_vhd_coalesce_max_attempts xen -xenapi_vhd_coalesce_poll_interval xen -xenapi_vif_driver xen xvpvncproxy_base_url xvpnvncproxy xvpvncproxy_host xvpnvncproxy xvpvncproxy_port xvpnvncproxy