diff --git a/doc/common/tables/cinder-api.xml b/doc/common/tables/cinder-api.xml index a248536133..357f8d93d0 100644 --- a/doc/common/tables/cinder-api.xml +++ b/doc/common/tables/cinder-api.xml @@ -37,10 +37,6 @@ = 525600 (IntOpt) Default timeout for CLI operations in minutes. For example, LUN migration is a typical long running operation, which depends on the LUN size and the load of the array. An upper bound in the specific deployment can be set to avoid unnecessary long wait. By default, it is 365 days long. - - = False - (BoolOpt) Enables the Force option on upload_to_image. This enables running upload_volume on in-use volumes for backends that support it. - = True (BoolOpt) DEPRECATED: Deploy v1 of the Cinder API. diff --git a/doc/common/tables/cinder-auth.xml b/doc/common/tables/cinder-auth.xml index 74139e8beb..b3bddff414 100644 --- a/doc/common/tables/cinder-auth.xml +++ b/doc/common/tables/cinder-auth.xml @@ -18,7 +18,7 @@ [DEFAULT] - = keystone + = noauth (StrOpt) The strategy to use for auth. Supports noauth, keystone, and deprecated. diff --git a/doc/common/tables/cinder-auth_token.xml b/doc/common/tables/cinder-auth_token.xml index bdbab0f245..cc99ca8c7a 100644 --- a/doc/common/tables/cinder-auth_token.xml +++ b/doc/common/tables/cinder-auth_token.xml @@ -119,7 +119,7 @@ = 10 - (IntOpt) (Optional) Number of seconds that an operation will wait to get a memcached client connection from the pool. + (IntOpt) (Optional) Number of seconds that an operation will wait to get a memcache client connection from the pool. = 300 @@ -131,7 +131,7 @@ = 3 - (IntOpt) (Optional) Socket timeout in seconds for communicating with a memcached server. + (IntOpt) (Optional) Socket timeout in seconds for communicating with a memcache server. = 60 @@ -147,7 +147,7 @@ = False - (BoolOpt) (Optional) Use the advanced (eventlet safe) memcached client pool. The advanced pool will only work under python 2.x. + (BoolOpt) (Optional) Use the advanced (eventlet safe) memcache client pool. The advanced pool will only work under python 2.x. = 10 diff --git a/doc/common/tables/cinder-backups_swift.xml b/doc/common/tables/cinder-backups_swift.xml index ec65ec7f29..80341ef11d 100644 --- a/doc/common/tables/cinder-backups_swift.xml +++ b/doc/common/tables/cinder-backups_swift.xml @@ -29,10 +29,6 @@ = 32768 (IntOpt) The size in bytes that changes are tracked for incremental backups. backup_swift_object_size has to be multiple of backup_swift_block_size. - - = None - (StrOpt) Location of the CA certificate file to use for swift client requests. - = volumebackups (StrOpt) The default Swift container to use diff --git a/doc/common/tables/cinder-netapp_eseries_iscsi.xml b/doc/common/tables/cinder-netapp_eseries_iscsi.xml index e413eec520..534fcf44dd 100644 --- a/doc/common/tables/cinder-netapp_eseries_iscsi.xml +++ b/doc/common/tables/cinder-netapp_eseries_iscsi.xml @@ -22,21 +22,13 @@ (StrOpt) This option is only utilized when the storage family is configured to eseries. This option is used to restrict provisioning to the specified controllers. Specify the value of this option to be a comma separated list of controller hostnames or IP addresses to be used for provisioning. - = True - (BoolOpt) This option specifies whether the driver should allow operations that require multiple attachments to a volume. An example would be live migration of servers that have volumes attached. When enabled, this backend is limited to 256 total volumes in order to guarantee volumes can be accessed by more than one host. - - - = None - (StrOpt) This option defines the type of operating system for all initiators that can access a LUN. This information is used when mapping LUNs to individual hosts or groups of hosts. + = linux_dm_mp + (StrOpt) This option is used to define how the controllers in the E-Series storage array will work with the particular operating system on the hosts that are connected to it. = None (StrOpt) Administrative user account name used to access the storage system or proxy server. - - = None - (StrOpt) This option defines the type of operating system that will access a LUN exported from Data ONTAP; it is assigned to the LUN at the time it is created. - = None (StrOpt) The name of the config.conf stanza for a Data ONTAP (7-mode) HA partner. This option is only used by the driver when connecting to an instance with a storage family of Data ONTAP operating in 7-Mode, and it is required if the storage protocol selected is FC. diff --git a/doc/common/tables/cinder-storage_ceph.xml b/doc/common/tables/cinder-storage_ceph.xml index 075f47803d..24c80ac36e 100644 --- a/doc/common/tables/cinder-storage_ceph.xml +++ b/doc/common/tables/cinder-storage_ceph.xml @@ -25,10 +25,6 @@ = (StrOpt) Path to the ceph configuration file - - = ceph - (StrOpt) The name of ceph cluster - = False (BoolOpt) Flatten volumes created from snapshots to remove dependency from volume to snapshot diff --git a/doc/common/tables/glance-auth_token.xml b/doc/common/tables/glance-auth_token.xml index f62163e2ac..bdcf1208c7 100644 --- a/doc/common/tables/glance-auth_token.xml +++ b/doc/common/tables/glance-auth_token.xml @@ -119,7 +119,7 @@ = 10 - (IntOpt) (Optional) Number of seconds that an operation will wait to get a memcached client connection from the pool. + (IntOpt) (Optional) Number of seconds that an operation will wait to get a memcache client connection from the pool. = 300 @@ -131,7 +131,7 @@ = 3 - (IntOpt) (Optional) Socket timeout in seconds for communicating with a memcached server. + (IntOpt) (Optional) Socket timeout in seconds for communicating with a memcache server. = 60 @@ -147,7 +147,7 @@ = False - (BoolOpt) (Optional) Use the advanced (eventlet safe) memcached client pool. The advanced pool will only work under python 2.x. + (BoolOpt) (Optional) Use the advanced (eventlet safe) memcache client pool. The advanced pool will only work under python 2.x. = 10 diff --git a/doc/common/tables/glance-imagecache.xml b/doc/common/tables/glance-imagecache.xml index d04f33a0eb..5f776b28c0 100644 --- a/doc/common/tables/glance-imagecache.xml +++ b/doc/common/tables/glance-imagecache.xml @@ -19,11 +19,11 @@ = False - (BoolOpt) DEPRECATED. TO BE REMOVED IN THE LIBERTY RELEASE. A boolean that determines if the scrubber should clean up the files it uses for taking data. Only one server in your deployment should be designated the cleanup host. + (BoolOpt) A boolean that determines if the scrubber should clean up the files it uses for taking data. Only one server in your deployment should be designated the cleanup host. = 86400 - (IntOpt) DEPRECATED. TO BE REMOVED IN THE LIBERTY RELEASE. Items must have a modified time that is older than this value in order to be candidates for cleanup. + (IntOpt) Items must have a modified time that is older than this value in order to be candidates for cleanup. = False diff --git a/doc/common/tables/heat-amqp.xml b/doc/common/tables/heat-amqp.xml index 73949814c4..6fc904ed8d 100644 --- a/doc/common/tables/heat-amqp.xml +++ b/doc/common/tables/heat-amqp.xml @@ -35,7 +35,7 @@ = [] - (MultiStrOpt) The Drivers(s) to handle sending notifications. Possible values are messaging, messagingv2, routing,log, test, noop + (MultiStrOpt) Driver or drivers to handle sending notifications. = notifications diff --git a/doc/common/tables/heat-api.xml b/doc/common/tables/heat-api.xml index 8461089959..25a2624bc4 100644 --- a/doc/common/tables/heat-api.xml +++ b/doc/common/tables/heat-api.xml @@ -45,10 +45,6 @@ = (StrOpt) URL of the Heat CloudWatch server. - - = - (ListOpt) Stacks containing these tag names will be hidden. Multiple tags should be given in a comma-delimited list (eg. hidden_stack_tags=hide_me,me_too). - = 1048576 (IntOpt) Maximum raw byte size of JSON request body. Should be larger than max_template_size. @@ -174,13 +170,6 @@ = 0 (IntOpt) Number of workers for Heat service. - - [oslo_versionedobjects] - - - = False - (BoolOpt) Make exception message format errors fatal - [paste_deploy] diff --git a/doc/common/tables/heat-auth_token.xml b/doc/common/tables/heat-auth_token.xml index e613506238..1073cdc560 100644 --- a/doc/common/tables/heat-auth_token.xml +++ b/doc/common/tables/heat-auth_token.xml @@ -119,7 +119,7 @@ = 10 - (IntOpt) (Optional) Number of seconds that an operation will wait to get a memcached client connection from the pool. + (IntOpt) (Optional) Number of seconds that an operation will wait to get a memcache client connection from the pool. = 300 @@ -131,7 +131,7 @@ = 3 - (IntOpt) (Optional) Socket timeout in seconds for communicating with a memcached server. + (IntOpt) (Optional) Socket timeout in seconds for communicating with a memcache server. = 60 @@ -147,7 +147,7 @@ = False - (BoolOpt) (Optional) Use the advanced (eventlet safe) memcached client pool. The advanced pool will only work under python 2.x. + (BoolOpt) (Optional) Use the advanced (eventlet safe) memcache client pool. The advanced pool will only work under python 2.x. = 10 diff --git a/doc/common/tables/heat-logging.xml b/doc/common/tables/heat-logging.xml index 4111f69bf3..5b0dcd6e19 100644 --- a/doc/common/tables/heat-logging.xml +++ b/doc/common/tables/heat-logging.xml @@ -29,6 +29,10 @@ = False (BoolOpt) Enables or disables fatal status of deprecations. + + = False + (BoolOpt) Make exception message format errors fatal + = "[instance: %(uuid)s] " (StrOpt) The format for an instance that is passed with the log message. @@ -86,8 +90,8 @@ (BoolOpt) Use syslog for logging. Existing syslog format is DEPRECATED during I, and will change in J to honor RFC5424. - = True - (BoolOpt) (Optional) Enables or disables syslog rfc5424 format for logging. If enabled, prefixes the MSG part of the syslog message with APP-NAME (RFC5424). The format without the APP-NAME is deprecated in K, and will be removed in L, along with this option. + = False + (BoolOpt) (Optional) Enables or disables syslog rfc5424 format for logging. If enabled, prefixes the MSG part of the syslog message with APP-NAME (RFC5424). The format without the APP-NAME is deprecated in I, and will be removed in J. = True diff --git a/doc/common/tables/heat-rpc.xml b/doc/common/tables/heat-rpc.xml index cc72ddbc9a..66efd7f7ba 100644 --- a/doc/common/tables/heat-rpc.xml +++ b/doc/common/tables/heat-rpc.xml @@ -74,7 +74,7 @@ = - (StrOpt) CA certificate PEM file to verify server certificate + (StrOpt) CA certificate PEM file for verifing server certificate = diff --git a/doc/common/tables/heat-zeromq.xml b/doc/common/tables/heat-zeromq.xml index e77809cb5b..3f68ac1b85 100644 --- a/doc/common/tables/heat-zeromq.xml +++ b/doc/common/tables/heat-zeromq.xml @@ -34,7 +34,7 @@ (StrOpt) Directory for holding IPC sockets. - = local + = oslo_messaging._drivers.matchmaker.MatchMakerLocalhost (StrOpt) MatchMaker driver. diff --git a/doc/common/tables/ironic-amqp.xml b/doc/common/tables/ironic-amqp.xml index fbf5fbec51..05ae61879c 100644 --- a/doc/common/tables/ironic-amqp.xml +++ b/doc/common/tables/ironic-amqp.xml @@ -23,7 +23,7 @@ = [] - (MultiStrOpt) The Drivers(s) to handle sending notifications. Possible values are messaging, messagingv2, routing,log, test, noop + (MultiStrOpt) Driver or drivers to handle sending notifications. = notifications diff --git a/doc/common/tables/ironic-auth_token.xml b/doc/common/tables/ironic-auth_token.xml index 13e428df29..bcccb09b31 100644 --- a/doc/common/tables/ironic-auth_token.xml +++ b/doc/common/tables/ironic-auth_token.xml @@ -119,7 +119,7 @@ = 10 - (IntOpt) (Optional) Number of seconds that an operation will wait to get a memcached client connection from the pool. + (IntOpt) (Optional) Number of seconds that an operation will wait to get a memcache client connection from the pool. = 300 @@ -131,7 +131,7 @@ = 3 - (IntOpt) (Optional) Socket timeout in seconds for communicating with a memcached server. + (IntOpt) (Optional) Socket timeout in seconds for communicating with a memcache server. = 60 @@ -147,7 +147,7 @@ = False - (BoolOpt) (Optional) Use the advanced (eventlet safe) memcached client pool. The advanced pool will only work under python 2.x. + (BoolOpt) (Optional) Use the advanced (eventlet safe) memcache client pool. The advanced pool will only work under python 2.x. = None diff --git a/doc/common/tables/ironic-conductor.xml b/doc/common/tables/ironic-conductor.xml index 263684e5a6..a31f82830c 100644 --- a/doc/common/tables/ironic-conductor.xml +++ b/doc/common/tables/ironic-conductor.xml @@ -83,7 +83,7 @@ = ALL - (ListOpt) List of comma separated meter types which need to be sent to Ceilometer. The default value, "ALL", is a special value meaning send all the sensor data. + (ListOpt) List of comma separated metric types which need to be sent to Ceilometer. The default value, "ALL", is a special value meaning send all the sensor data. = 180 diff --git a/doc/common/tables/ironic-rpc.xml b/doc/common/tables/ironic-rpc.xml index 7830c521eb..6bd5fd95ad 100644 --- a/doc/common/tables/ironic-rpc.xml +++ b/doc/common/tables/ironic-rpc.xml @@ -81,7 +81,7 @@ = - (StrOpt) CA certificate PEM file to verify server certificate + (StrOpt) CA certificate PEM file for verifing server certificate = diff --git a/doc/common/tables/ironic-zeromq.xml b/doc/common/tables/ironic-zeromq.xml index bd6f9db411..0b95188fdf 100644 --- a/doc/common/tables/ironic-zeromq.xml +++ b/doc/common/tables/ironic-zeromq.xml @@ -34,7 +34,7 @@ (StrOpt) Directory for holding IPC sockets. - = local + = oslo_messaging._drivers.matchmaker.MatchMakerLocalhost (StrOpt) MatchMaker driver. diff --git a/doc/common/tables/keystone-amqp.xml b/doc/common/tables/keystone-amqp.xml index 6ad6fd8a63..dd0801b0c3 100644 --- a/doc/common/tables/keystone-amqp.xml +++ b/doc/common/tables/keystone-amqp.xml @@ -27,11 +27,11 @@ = [] - (MultiStrOpt) The Drivers(s) to handle sending notifications. Possible values are messaging, messagingv2, routing,log, test, noop + (MultiStrOpt) Driver or drivers to handle sending notifications. = basic - (StrOpt) Define the notification format for Identity Service events. A "basic" notification has information about the resource being operated on. A "cadf" notification has the same information, as well as information about the initiator of the event. + (StrOpt) Define the notification format for Identity Service events. A "basic" notification has information about the resource being operated on. A "cadf" notification has the same information, as well as information about the initiator of the event. Valid options are: basic and cadf = notifications diff --git a/doc/common/tables/keystone-auth_token.xml b/doc/common/tables/keystone-auth_token.xml index 5b6b175e61..4852438ed8 100644 --- a/doc/common/tables/keystone-auth_token.xml +++ b/doc/common/tables/keystone-auth_token.xml @@ -119,7 +119,7 @@ = 10 - (IntOpt) (Optional) Number of seconds that an operation will wait to get a memcached client connection from the pool. + (IntOpt) (Optional) Number of seconds that an operation will wait to get a memcache client connection from the pool. = 300 @@ -131,7 +131,7 @@ = 3 - (IntOpt) (Optional) Socket timeout in seconds for communicating with a memcached server. + (IntOpt) (Optional) Socket timeout in seconds for communicating with a memcache server. = 60 @@ -147,7 +147,7 @@ = False - (BoolOpt) (Optional) Use the advanced (eventlet safe) memcached client pool. The advanced pool will only work under python 2.x. + (BoolOpt) (Optional) Use the advanced (eventlet safe) memcache client pool. The advanced pool will only work under python 2.x. = 10 diff --git a/doc/common/tables/keystone-ldap.xml b/doc/common/tables/keystone-ldap.xml index 55e504dcdd..edcb6f041c 100644 --- a/doc/common/tables/keystone-ldap.xml +++ b/doc/common/tables/keystone-ldap.xml @@ -19,7 +19,7 @@ = default - (StrOpt) The LDAP dereferencing option for queries. The "default" option falls back to using default dereferencing configured by your ldap.conf. + (StrOpt) The LDAP dereferencing option for queries. This can be either "never", "searching", "always", "finding" or "default". The "default" option falls back to using default dereferencing configured by your ldap.conf. = False @@ -187,7 +187,7 @@ = one - (StrOpt) The LDAP scope for queries, "one" represents oneLevel/singleLevel and "sub" represents subtree/wholeSubtree options. + (StrOpt) The LDAP scope for queries, this can be either "one" (onelevel/singleLevel) or "sub" (subtree/wholeSubtree). = @@ -247,7 +247,7 @@ = demand - (StrOpt) Specifies what checks to perform on client certificates in an incoming TLS session. + (StrOpt) Valid options for tls_req_cert are demand, never, and allow. = ldap://localhost diff --git a/doc/common/tables/keystone-logging.xml b/doc/common/tables/keystone-logging.xml index 3ea620b850..d4b8f0307f 100644 --- a/doc/common/tables/keystone-logging.xml +++ b/doc/common/tables/keystone-logging.xml @@ -86,8 +86,8 @@ (BoolOpt) Use syslog for logging. Existing syslog format is DEPRECATED during I, and will change in J to honor RFC5424. - = True - (BoolOpt) (Optional) Enables or disables syslog rfc5424 format for logging. If enabled, prefixes the MSG part of the syslog message with APP-NAME (RFC5424). The format without the APP-NAME is deprecated in K, and will be removed in L, along with this option. + = False + (BoolOpt) (Optional) Enables or disables syslog rfc5424 format for logging. If enabled, prefixes the MSG part of the syslog message with APP-NAME (RFC5424). The format without the APP-NAME is deprecated in I, and will be removed in J. = True diff --git a/doc/common/tables/keystone-rpc.xml b/doc/common/tables/keystone-rpc.xml index 8714313254..bfb25b0744 100644 --- a/doc/common/tables/keystone-rpc.xml +++ b/doc/common/tables/keystone-rpc.xml @@ -70,7 +70,7 @@ = - (StrOpt) CA certificate PEM file to verify server certificate + (StrOpt) CA certificate PEM file for verifing server certificate = diff --git a/doc/common/tables/keystone-saml.xml b/doc/common/tables/keystone-saml.xml index 98338113e5..febfa26a33 100644 --- a/doc/common/tables/keystone-saml.xml +++ b/doc/common/tables/keystone-saml.xml @@ -47,7 +47,7 @@ = other - (StrOpt) The contact type describing the main point of contact for the identity provider. + (StrOpt) Contact type. Allowed values are: technical, support, administrative billing, and other = None diff --git a/doc/common/tables/keystone-zeromq.xml b/doc/common/tables/keystone-zeromq.xml index 47651f276a..29441fc42d 100644 --- a/doc/common/tables/keystone-zeromq.xml +++ b/doc/common/tables/keystone-zeromq.xml @@ -34,7 +34,7 @@ (StrOpt) Directory for holding IPC sockets. - = local + = oslo_messaging._drivers.matchmaker.MatchMakerLocalhost (StrOpt) MatchMaker driver. diff --git a/doc/common/tables/nova-auth_token.xml b/doc/common/tables/nova-auth_token.xml index 1d45eeda36..7b93185d54 100644 --- a/doc/common/tables/nova-auth_token.xml +++ b/doc/common/tables/nova-auth_token.xml @@ -119,7 +119,7 @@ = 10 - (IntOpt) (Optional) Number of seconds that an operation will wait to get a memcached client connection from the pool. + (IntOpt) (Optional) Number of seconds that an operation will wait to get a memcache client connection from the pool. = 300 @@ -131,7 +131,7 @@ = 3 - (IntOpt) (Optional) Socket timeout in seconds for communicating with a memcached server. + (IntOpt) (Optional) Socket timeout in seconds for communicating with a memcache server. = 60 @@ -147,7 +147,7 @@ = False - (BoolOpt) (Optional) Use the advanced (eventlet safe) memcached client pool. The advanced pool will only work under python 2.x. + (BoolOpt) (Optional) Use the advanced (eventlet safe) memcache client pool. The advanced pool will only work under python 2.x. = 10 diff --git a/doc/common/tables/nova-cells.xml b/doc/common/tables/nova-cells.xml index 7e47ae6f13..cd0d0daff9 100644 --- a/doc/common/tables/nova-cells.xml +++ b/doc/common/tables/nova-cells.xml @@ -66,12 +66,12 @@ (IntOpt) Number of seconds after which a lack of capability and capacity updates signals the child cell is to be treated as a mute. - = -10000.0 + = -10.0 (FloatOpt) Multiplier used to weigh mute children. (The value should be negative.) - = None - (FloatOpt) DEPRECATED: this option has no effect anymore. Please use "mute_weight_multiplier" instead. This option is deprecated in the 2015.1 release and will be removed in the 2015.2 release. + = 1000.0 + (FloatOpt) Weight value assigned to mute children. (The value should be positive.) = nova diff --git a/doc/common/tables/nova-common.xml b/doc/common/tables/nova-common.xml index 1fb052eede..411a7c687b 100644 --- a/doc/common/tables/nova-common.xml +++ b/doc/common/tables/nova-common.xml @@ -77,10 +77,6 @@ = None (StrOpt) Explicitly specify the temporary working directory - - = 0 - (IntOpt) Interval in seconds for updating compute resources. A number less than 0 means to disable the task completely. Leaving this at the default of 0 will cause this to run at the default periodic interval. Setting it to any positive value will cause it to run at approximately that number of seconds. - [keystone_authtoken] diff --git a/doc/common/tables/nova-compute.xml b/doc/common/tables/nova-compute.xml index 1309cbc4e3..ee12a40984 100644 --- a/doc/common/tables/nova-compute.xml +++ b/doc/common/tables/nova-compute.xml @@ -23,7 +23,7 @@ = None - (StrOpt) Driver to use for controlling virtualization. Options include: libvirt.LibvirtDriver, xenapi.XenAPIDriver, fake.FakeDriver, ironic.IronicDriver, vmwareapi.VMwareVCDriver, hyperv.HyperVDriver + (StrOpt) Driver to use for controlling virtualization. Options include: libvirt.LibvirtDriver, xenapi.XenAPIDriver, fake.FakeDriver, baremetal.BareMetalDriver, vmwareapi.VMwareVCDriver, hyperv.HyperVDriver = nova.compute.manager.ComputeManager diff --git a/doc/common/tables/nova-policy.xml b/doc/common/tables/nova-policy.xml index 8b62c4bdaa..b7d841ddc9 100644 --- a/doc/common/tables/nova-policy.xml +++ b/doc/common/tables/nova-policy.xml @@ -21,6 +21,10 @@ = True (BoolOpt) Permit instance snapshot operations. + + = False + (BoolOpt) Allow migrate machine to the same host. Useful when testing in single-host environments. + = False (BoolOpt) Allow destination machine to match source for resize. Useful when testing in single-host environments. diff --git a/doc/common/tables/nova-vmware.xml b/doc/common/tables/nova-vmware.xml index 46d25e5901..c022f033dd 100644 --- a/doc/common/tables/nova-vmware.xml +++ b/doc/common/tables/nova-vmware.xml @@ -29,10 +29,6 @@ = None (MultiStrOpt) Name of a VMware Cluster ComputeResource. - - = None - (IntOpt) Set this value if affected by an increased network latency causing repeated characters when typing in a remote console. - = None (StrOpt) Regex to match the name of a datastore. diff --git a/doc/common/tables/sahara-auth_token.xml b/doc/common/tables/sahara-auth_token.xml index 16b4e6c30c..6506419eea 100644 --- a/doc/common/tables/sahara-auth_token.xml +++ b/doc/common/tables/sahara-auth_token.xml @@ -119,7 +119,7 @@ = 10 - (IntOpt) (Optional) Number of seconds that an operation will wait to get a memcached client connection from the pool. + (IntOpt) (Optional) Number of seconds that an operation will wait to get a memcache client connection from the pool. = 300 @@ -131,7 +131,7 @@ = 3 - (IntOpt) (Optional) Socket timeout in seconds for communicating with a memcached server. + (IntOpt) (Optional) Socket timeout in seconds for communicating with a memcache server. = 60 @@ -147,7 +147,7 @@ = False - (BoolOpt) (Optional) Use the advanced (eventlet safe) memcached client pool. The advanced pool will only work under python 2.x. + (BoolOpt) (Optional) Use the advanced (eventlet safe) memcache client pool. The advanced pool will only work under python 2.x. = 10 diff --git a/doc/common/tables/sahara-rpc.xml b/doc/common/tables/sahara-rpc.xml index f32b225d92..39c0a32654 100644 --- a/doc/common/tables/sahara-rpc.xml +++ b/doc/common/tables/sahara-rpc.xml @@ -167,8 +167,8 @@ (IntOpt) How often times during the heartbeat_timeout_threshold we check the heartbeat. - = 60 - (IntOpt) Number of seconds after which the Rabbit broker is considered down if heartbeat's keep-alive fails (0 disable the heartbeat). + = 0 + (IntOpt) Number of seconds after which the Rabbit broker is considered down if heartbeat's keep-alive fails (0 disables the heartbeat, >0 enables it. Enabling heartbeats requires kombu>=3.0.7 and amqp>=1.4.0). EXPERIMENTAL = 1.0 diff --git a/doc/common/tables/sahara-zeromq.xml b/doc/common/tables/sahara-zeromq.xml index 80d51cea35..d5fa1ad9da 100644 --- a/doc/common/tables/sahara-zeromq.xml +++ b/doc/common/tables/sahara-zeromq.xml @@ -34,7 +34,7 @@ (StrOpt) Directory for holding IPC sockets. - = oslo_messaging._drivers.matchmaker.MatchMakerLocalhost + = local (StrOpt) MatchMaker driver. diff --git a/doc/common/tables/swift-account-server-DEFAULT.xml b/doc/common/tables/swift-account-server-DEFAULT.xml index c7d75ec7e7..becd3f4cdc 100644 --- a/doc/common/tables/swift-account-server-DEFAULT.xml +++ b/doc/common/tables/swift-account-server-DEFAULT.xml @@ -115,8 +115,7 @@ number of workers can lessen the impact that a CPU intensive, or blocking, request can have on other requests served by the same worker. If the maximum number of clients is set to one, then a given worker will not perform another call while processing, allowing -other workers a chance to process it. - +other workers a chance to process it. = true diff --git a/doc/common/tables/swift-container-server-DEFAULT.xml b/doc/common/tables/swift-container-server-DEFAULT.xml index 3bae1317d2..7572d6cbda 100644 --- a/doc/common/tables/swift-container-server-DEFAULT.xml +++ b/doc/common/tables/swift-container-server-DEFAULT.xml @@ -119,8 +119,7 @@ number of workers can lessen the impact that a CPU intensive, or blocking, request can have on other requests served by the same worker. If the maximum number of clients is set to one, then a given worker will not perform another call while processing, allowing -other workers a chance to process it. - +other workers a chance to process it. = true diff --git a/doc/common/tables/swift-container-server-container-sync.xml b/doc/common/tables/swift-container-server-container-sync.xml index 97f091adfb..39dcc1fefc 100644 --- a/doc/common/tables/swift-container-server-container-sync.xml +++ b/doc/common/tables/swift-container-server-container-sync.xml @@ -16,10 +16,18 @@ + + = 5 + Connection timeout to external services + = 60 Maximum amount of time to spend syncing each container + + = /etc/swift/internal-client.conf + No help text available for this option. + = 300 Minimum time for a pass to take @@ -40,6 +48,10 @@ = container-sync Label used when logging + + = 3 + No help text available for this option. + = http://10.1.1.1:8888,http://10.1.1.2:8888 If you need to use an HTTP proxy, set it here. Defaults to no proxy. diff --git a/doc/common/tables/swift-internal-client-DEFAULT.xml b/doc/common/tables/swift-internal-client-DEFAULT.xml new file mode 100644 index 0000000000..c0b373c2da --- /dev/null +++ b/doc/common/tables/swift-internal-client-DEFAULT.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of configuration options for + [DEFAULT] in internal-client.conf +
Configuration option = Default valueDescription
= /dev/logLocation where syslog sends the logs to
= Comma-separated list of functions to call to setup custom log handlers.
= LOG_LOCAL0Syslog log facility
= INFOLogging level
= swiftLabel used when logging
= 1.0Defines the probability of sending a sample for any given event or + timing measurement.
= localhostIf not set, the StatsD feature is disabled.
= Value will be prepended to every metric sent to the StatsD server.
= 8125Port value for the StatsD server.
= 1.0Not recommended to set this to a value less than 1.0, if frequency + of logging is too high, tune the + log_statsd_default_sample_rate instead.
= If not set, the UDP receiver for syslog is disabled.
= 514Port value for UDP receiver, if enabled.
= /etc/swiftSwift configuration directory
= swiftUser to run as
+
diff --git a/doc/common/tables/swift-internal-client-app-proxy-server.xml b/doc/common/tables/swift-internal-client-app-proxy-server.xml new file mode 100644 index 0000000000..37b52a489b --- /dev/null +++ b/doc/common/tables/swift-internal-client-app-proxy-server.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + +
Description of configuration options for + [app-proxy-server] in internal-client.conf +
Configuration option = Default valueDescription
= egg:swift#proxyEntry point of paste.deploy in the server
+
diff --git a/doc/common/tables/swift-internal-client-filter-cache.xml b/doc/common/tables/swift-internal-client-filter-cache.xml new file mode 100644 index 0000000000..035295fdec --- /dev/null +++ b/doc/common/tables/swift-internal-client-filter-cache.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + +
Description of configuration options for + [filter-cache] in internal-client.conf +
Configuration option = Default valueDescription
= egg:swift#memcacheEntry point of paste.deploy in the server
+
diff --git a/doc/common/tables/swift-internal-client-filter-catch_errors.xml b/doc/common/tables/swift-internal-client-filter-catch_errors.xml new file mode 100644 index 0000000000..8e65ee1b4e --- /dev/null +++ b/doc/common/tables/swift-internal-client-filter-catch_errors.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + +
Description of configuration options for + [filter-catch_errors] in internal-client.conf +
Configuration option = Default valueDescription
= egg:swift#catch_errorsEntry point of paste.deploy in the server
+
diff --git a/doc/common/tables/swift-internal-client-filter-proxy-logging.xml b/doc/common/tables/swift-internal-client-filter-proxy-logging.xml new file mode 100644 index 0000000000..09a130f3d9 --- /dev/null +++ b/doc/common/tables/swift-internal-client-filter-proxy-logging.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + +
Description of configuration options for + [filter-proxy-logging] in internal-client.conf +
Configuration option = Default valueDescription
= egg:swift#proxy_loggingEntry point of paste.deploy in the server
+
diff --git a/doc/common/tables/swift-internal-client-pipeline-main.xml b/doc/common/tables/swift-internal-client-pipeline-main.xml new file mode 100644 index 0000000000..823bb16762 --- /dev/null +++ b/doc/common/tables/swift-internal-client-pipeline-main.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + +
Description of configuration options for + [pipeline-main] in internal-client.conf +
Configuration option = Default valueDescription
= catch_errors proxy-logging cache proxy-serverNo help text available for this option.
+
diff --git a/doc/common/tables/swift-object-server-DEFAULT.xml b/doc/common/tables/swift-object-server-DEFAULT.xml index de780a4bdb..ff2bc37460 100644 --- a/doc/common/tables/swift-object-server-DEFAULT.xml +++ b/doc/common/tables/swift-object-server-DEFAULT.xml @@ -131,8 +131,7 @@ number of workers can lessen the impact that a CPU intensive, or blocking, request can have on other requests served by the same worker. If the maximum number of clients is set to one, then a given worker will not perform another call while processing, allowing -other workers a chance to process it. - +other workers a chance to process it. = true diff --git a/doc/common/tables/swift-object-server-object-reconstructor.xml b/doc/common/tables/swift-object-server-object-reconstructor.xml new file mode 100644 index 0000000000..bbf0df3a3f --- /dev/null +++ b/doc/common/tables/swift-object-server-object-reconstructor.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of configuration options for + [object-reconstructor] in object-server.conf +
Configuration option = Default valueDescription
= 1Number of replication workers to spawn
= onWhether or not to run replication as a daemon
= FalseIf set to True, partitions that are not supposed to be on the node will be replicated first. The default setting should not be changed, except for extreme situations.
= 60Maximum duration for an HTTP request
= 1800Attempts to kill all workers if nothing replications for lockup_timeout seconds
= /dev/logLocation where syslog sends the logs to
= LOG_LOCAL0Syslog log facility
= INFOLogging level
= object-reconstructorLabel used when logging
= 10Request timeout to external services
= 604800Time elapsed in seconds before an object can be reclaimed
= /var/cache/swiftDirectory where stats for a few items will be stored
= 15How often (in seconds) to check the ring
= 30Time in seconds to wait between replication passes
= 300Interval in seconds between logging replication statistics
+
diff --git a/doc/common/tables/swift-proxy-server-DEFAULT.xml b/doc/common/tables/swift-proxy-server-DEFAULT.xml index ac52148607..0b206c7aed 100644 --- a/doc/common/tables/swift-proxy-server-DEFAULT.xml +++ b/doc/common/tables/swift-proxy-server-DEFAULT.xml @@ -49,7 +49,7 @@ is a list of hosts that are included with any CORS request by default and returned with the Access-Control-Allow-Origin header in addition to what the container has set. to call to setup custom log handlers. for eventlet the proxy server. For most cases, this should be `egg:swift#proxy`. request whenever it has to failover to a handoff node - = container_quotas, tempurl, bulk_delete.max_failed_deletes + = swift.valid_api_versions, container_quotas, tempurl No help text available for this option. @@ -139,8 +139,7 @@ number of workers can lessen the impact that a CPU intensive, or blocking, request can have on other requests served by the same worker. If the maximum number of clients is set to one, then a given worker will not perform another call while processing, allowing -other workers a chance to process it. - +other workers a chance to process it. = True diff --git a/doc/common/tables/swift-proxy-server-filter-cache.xml b/doc/common/tables/swift-proxy-server-filter-cache.xml index 1de8d91a30..b213c3e1d2 100644 --- a/doc/common/tables/swift-proxy-server-filter-cache.xml +++ b/doc/common/tables/swift-proxy-server-filter-cache.xml @@ -22,11 +22,11 @@ = 2 - No help text available for this option. + Sets how memcache values are serialized and deserialized = 127.0.0.1:11211 - Comma separated list of memcached servers ip:port services + Comma-separated list of memcached servers ip:port services = /dev/log diff --git a/doc/common/tables/swift-proxy-server-filter-keystoneauth.xml b/doc/common/tables/swift-proxy-server-filter-keystoneauth.xml index a08c0aef6f..3463e7dcfb 100644 --- a/doc/common/tables/swift-proxy-server-filter-keystoneauth.xml +++ b/doc/common/tables/swift-proxy-server-filter-keystoneauth.xml @@ -34,7 +34,7 @@ you can set this to False. = false - If this option is set to True, it allows to give a user whose username is the same as the project name and who has any role in the project access rights elevated to be the same as if the user had one of the . Note that the condition compares names rather than + If this option is set to True, it allows to give a user whose username is the same as the project name and who has any role in the project access rights elevated to be the same as if the user had one of the operator_roles. Note that the condition compares names rather than UUIDs. This option is deprecated. It is False by default. diff --git a/doc/common/tables/swift-proxy-server-filter-tempauth.xml b/doc/common/tables/swift-proxy-server-filter-tempauth.xml index 5cbdb29b1a..6ca029951a 100644 --- a/doc/common/tables/swift-proxy-server-filter-tempauth.xml +++ b/doc/common/tables/swift-proxy-server-filter-tempauth.xml @@ -18,7 +18,10 @@ = true - No help text available for this option. + This option allows middleware higher in the WSGI pipeline to override auth +processing, useful for middleware such as tempurl and formpost. If you know +you are not going to use such middleware and you want a bit of extra security, +you can set this to False. = /auth/ diff --git a/doc/common/tables/swift-swift-storage-policy-0.xml b/doc/common/tables/swift-swift-storage-policy-0.xml index 2092b7b5fb..071bcb31fe 100644 --- a/doc/common/tables/swift-swift-storage-policy-0.xml +++ b/doc/common/tables/swift-swift-storage-policy-0.xml @@ -24,6 +24,10 @@ = Policy-0 No help text available for this option. + + = replication + No help text available for this option. + diff --git a/doc/common/tables/swift-swift-storage-policy-1.xml b/doc/common/tables/swift-swift-storage-policy-1.xml index 8b8e8aa919..b8924f1466 100644 --- a/doc/common/tables/swift-swift-storage-policy-1.xml +++ b/doc/common/tables/swift-swift-storage-policy-1.xml @@ -20,6 +20,10 @@ = silver No help text available for this option. + + = replication + No help text available for this option. + diff --git a/doc/common/tables/swift-swift-storage-policy-2.xml b/doc/common/tables/swift-swift-storage-policy-2.xml new file mode 100644 index 0000000000..117d46d228 --- /dev/null +++ b/doc/common/tables/swift-swift-storage-policy-2.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of configuration options for + [storage-policy-2] in swift.conf +
Configuration option = Default valueDescription
= 10No help text available for this option.
= 4No help text available for this option.
= 1048576No help text available for this option.
= jerasure_rs_vandNo help text available for this option.
= deepfreeze10-4No help text available for this option.
= erasure_codingNo help text available for this option.
+
diff --git a/doc/common/tables/swift-swift-swift-constraints.xml b/doc/common/tables/swift-swift-swift-constraints.xml index 5bd00d45a8..917e5fd9df 100644 --- a/doc/common/tables/swift-swift-swift-constraints.xml +++ b/doc/common/tables/swift-swift-swift-constraints.xml @@ -43,11 +43,11 @@ = 8192 The max number of bytes in the utf8 encoding of each header. - Using 8192 as default because eventlet use 8192 + Using 8192 as default because eventlet use 8192 as maximum size of header line. You may need to increase this value when using identity v3 API tokens including more than 7 catalog entries. - See also in proxy-server.conf-sample - (documented in overview_auth.rst). + See also include_service_catalog in proxy-server.conf-sample + (documented in overview_auth.rst). = 90 @@ -73,6 +73,10 @@ The max number of bytes in the utf8 encoding of an object name. + + = v0,v1,v2 + No help text available for this option. + diff --git a/doc/common/tables/swift-swift-swift-hash.xml b/doc/common/tables/swift-swift-swift-hash.xml index 4029e7f509..46c0275d07 100644 --- a/doc/common/tables/swift-swift-swift-hash.xml +++ b/doc/common/tables/swift-swift-swift-hash.xml @@ -18,8 +18,7 @@ = changeme - - A prefix used by hash_path to offer a bit more security when generating hashes for + A prefix used by hash_path to offer a bit more security when generating hashes for paths. It simply appends this value to all paths; if someone knows this suffix, it's easier for them to guess the hash a path will end up with. New installations are advised to set this parameter to a random secret, @@ -30,8 +29,7 @@ = changeme - - A suffix used by hash_path to offer a bit more security when generating hashes for + A suffix used by hash_path to offer a bit more security when generating hashes for paths. It simply appends this value to all paths; if someone knows this suffix, it's easier for them to guess the hash a path will end up with. New installations are advised to set this parameter to a random secret, diff --git a/doc/common/tables/trove-auth_token.xml b/doc/common/tables/trove-auth_token.xml index 6639def25d..b5d02a0750 100644 --- a/doc/common/tables/trove-auth_token.xml +++ b/doc/common/tables/trove-auth_token.xml @@ -119,7 +119,7 @@ = 10 - (IntOpt) (Optional) Number of seconds that an operation will wait to get a memcached client connection from the pool. + (IntOpt) (Optional) Number of seconds that an operation will wait to get a memcache client connection from the pool. = 300 @@ -131,7 +131,7 @@ = 3 - (IntOpt) (Optional) Socket timeout in seconds for communicating with a memcached server. + (IntOpt) (Optional) Socket timeout in seconds for communicating with a memcache server. = 60 @@ -147,7 +147,7 @@ = False - (BoolOpt) (Optional) Use the advanced (eventlet safe) memcached client pool. The advanced pool will only work under python 2.x. + (BoolOpt) (Optional) Use the advanced (eventlet safe) memcache client pool. The advanced pool will only work under python 2.x. = 10 diff --git a/doc/common/tables/trove-rpc.xml b/doc/common/tables/trove-rpc.xml index ac33811962..8cc76e8c8d 100644 --- a/doc/common/tables/trove-rpc.xml +++ b/doc/common/tables/trove-rpc.xml @@ -175,8 +175,8 @@ (IntOpt) How often times during the heartbeat_timeout_threshold we check the heartbeat. - = 60 - (IntOpt) Number of seconds after which the Rabbit broker is considered down if heartbeat's keep-alive fails (0 disable the heartbeat). + = 0 + (IntOpt) Number of seconds after which the Rabbit broker is considered down if heartbeat's keep-alive fails (0 disables the heartbeat, >0 enables it. Enabling heartbeats requires kombu>=3.0.7 and amqp>=1.4.0). EXPERIMENTAL = 1.0 diff --git a/doc/common/tables/trove-zeromq.xml b/doc/common/tables/trove-zeromq.xml index e625570f1b..cb31212030 100644 --- a/doc/common/tables/trove-zeromq.xml +++ b/doc/common/tables/trove-zeromq.xml @@ -34,7 +34,7 @@ (StrOpt) Directory for holding IPC sockets. - = oslo_messaging._drivers.matchmaker.MatchMakerLocalhost + = local (StrOpt) MatchMaker driver. diff --git a/tools/autogenerate-config-flagmappings/cinder.flagmappings b/tools/autogenerate-config-flagmappings/cinder.flagmappings index e7fc408aac..1ba1f21bb7 100644 --- a/tools/autogenerate-config-flagmappings/cinder.flagmappings +++ b/tools/autogenerate-config-flagmappings/cinder.flagmappings @@ -30,7 +30,6 @@ backup_share backups backup_swift_auth backups_swift backup_swift_auth_version backups_swift backup_swift_block_size backups_swift -backup_swift_ca_cert_file backups_swift backup_swift_container backups_swift backup_swift_enable_progress_timer backups_swift backup_swift_key backups_swift @@ -85,7 +84,6 @@ driver_client_cert datera driver_client_cert_key datera driver_data_namespace common driver_use_ssl xio -enable_force_upload api enable_new_services common enable_v1_api api enable_v2_api api @@ -241,10 +239,8 @@ nas_ssh_port nas naviseccli_path emc netapp_controller_ips netapp_eseries_iscsi netapp_copyoffload_tool_path netapp_cdot_nfs -netapp_enable_multiattach netapp_eseries_iscsi -netapp_host_type netapp_eseries_iscsi +netapp_eseries_host_type netapp_eseries_iscsi netapp_login netapp_7mode_iscsi netapp_7mode_nfs netapp_cdot_iscsi netapp_cdot_nfs netapp_eseries_iscsi -netapp_lun_ostype netapp_eseries_iscsi netapp_partner_backend_name netapp_7mode_iscsi netapp_7mode_nfs netapp_cdot_iscsi netapp_cdot_nfs netapp_eseries_iscsi netapp_password netapp_7mode_iscsi netapp_7mode_nfs netapp_cdot_iscsi netapp_cdot_nfs netapp_eseries_iscsi netapp_sa_password netapp_eseries_iscsi @@ -314,7 +310,6 @@ quota_snapshots quota quota_volumes quota rados_connect_timeout storage_ceph rbd_ceph_conf storage_ceph -rbd_cluster_name storage_ceph rbd_flatten_volume_from_snapshot storage_ceph rbd_max_clone_depth storage_ceph rbd_pool storage_ceph diff --git a/tools/autogenerate-config-flagmappings/heat.flagmappings b/tools/autogenerate-config-flagmappings/heat.flagmappings index 9caf687cc9..18e49690e9 100644 --- a/tools/autogenerate-config-flagmappings/heat.flagmappings +++ b/tools/autogenerate-config-flagmappings/heat.flagmappings @@ -19,11 +19,11 @@ environment_dir common error_wait_time common event_purge_batch_size common fatal_deprecations logging +fatal_exception_format_errors logging heat_metadata_server_url api metadata_api heat_stack_user_role api heat_waitcondition_server_url api waitcondition_api heat_watch_server_url api cloudwatch_api -hidden_stack_tags api host common instance_connection_https_validate_certificates cfn_api instance_connection_is_secure cfn_api @@ -284,7 +284,6 @@ oslo_messaging_rabbit/rabbit_use_ssl rpc oslo_messaging_rabbit/rabbit_userid rpc oslo_messaging_rabbit/rabbit_virtual_host rpc oslo_messaging_rabbit/rpc_conn_pool_size rpc -oslo_versionedobjects/fatal_exception_format_errors api paste_deploy/api_paste_config api paste_deploy/flavor api profiler/profiler_enabled testing diff --git a/tools/autogenerate-config-flagmappings/nova.flagmappings b/tools/autogenerate-config-flagmappings/nova.flagmappings index 6a6a1d5b21..73814060e8 100644 --- a/tools/autogenerate-config-flagmappings/nova.flagmappings +++ b/tools/autogenerate-config-flagmappings/nova.flagmappings @@ -1,6 +1,7 @@ aggregate_image_properties_isolation_namespace scheduler aggregate_image_properties_isolation_separator scheduler allow_instance_snapshots policy +allow_migrate_to_same_host policy allow_resize_to_same_host policy allow_same_net_traffic network api_paste_config api @@ -337,7 +338,6 @@ timeout_nbd hypervisor transport_url amqp until_refresh policy update_dns_entries network -update_resources_interval common use-syslog logging use-syslog-rfc-format logging use_cow_images hypervisor @@ -717,7 +717,6 @@ upgrade_levels/scheduler upgrade_levels vmware/api_retry_count vmware vmware/cache_prefix vmware vmware/cluster_name vmware -vmware/console_delay_seconds vmware vmware/datastore_regex vmware vmware/host_ip vmware vmware/host_password vmware