Skip to content

Commit

Permalink
Use sanitized values in new/updated tables
Browse files Browse the repository at this point in the history 
The tables have been regenerated with
https://review.openstack.org/130993.

Change-Id: Iacc095dd982a93740d1d475369e2cfc0bb1981ed
  • Loading branch information
Gauvain Pocentek committed Oct 26, 2014
1 parent a739d69 commit 31de361
Show file tree
Hide file tree
Showing 8 changed files with 43 additions and 48 deletions.
6 changes: 3 additions & 3 deletions doc/common/tables/ceilometer-conf-changes.xml
View file
Expand Up @@ -49,7 +49,7 @@
<td>(BoolOpt) Whether to log monkey patching</td>
</tr>
<tr>
<td>[DEFAULT] monkey_patch_modules = ['nova.api.ec2.cloud:nova.notifications.notify_decorator', 'nova.compute.api:nova.notifications.notify_decorator']</td>
<td>[DEFAULT] monkey_patch_modules = nova.api.ec2.cloud:nova.notifications.notify_decorator, nova.compute.api:nova.notifications.notify_decorator</td>
<td>(ListOpt) List of modules/decorators to monkey patch</td>
</tr>
<tr>
Expand Down Expand Up @@ -197,7 +197,7 @@
<td>(BoolOpt) If true, the revocation list will be checked for cached tokens. This requires that PKI tokens are configured on the Keystone server.</td>
</tr>
<tr>
<td>[keystone_authtoken] hash_algorithms = ['md5']</td>
<td>[keystone_authtoken] hash_algorithms = md5</td>
<td>(ListOpt) Hash algorithms to use for hashing PKI tokens. This may be a single algorithm or multiple. The algorithms are those supported by Python standard hashlib.new(). The hashes will be tried in the order given, so put the preferred one first for performance. The result of the first hash will be stored in the cache. This will typically be set to multiple values only while migrating from a less secure algorithm to a more secure one. Once all the old tokens are expired this option should be set to a single value for better performance.</td>
</tr>
<tr>
Expand Down Expand Up @@ -285,7 +285,7 @@
</tr>
<tr>
<td>[database] connection</td>
<td>sqlite:////home/gpocentek/Workspace/OpenStack/openstack-doc-tools/autogenerate_config_docs/sources/ceilometer/ceilometer/openstack/common/db/$sqlite_db</td>
<td>sqlite:////usr/lib/python/site-packages/ceilometer/ceilometer/openstack/common/db/$sqlite_db</td>
<td>None</td>
</tr>
<tr>
Expand Down
4 changes: 2 additions & 2 deletions doc/common/tables/cinder-conf-changes.xml
View file
Expand Up @@ -85,7 +85,7 @@
<td>(StrOpt) Location of ca certificates file to use for glance client requests.</td>
</tr>
<tr>
<td>[DEFAULT] glance_core_properties = ['checksum', 'container_format', 'disk_format', 'image_name', 'image_id', 'min_disk', 'min_ram', 'name', 'size']</td>
<td>[DEFAULT] glance_core_properties = checksum, container_format, disk_format, image_name, image_id, min_disk, min_ram, name, size</td>
<td>(ListOpt) Default core properties of image</td>
</tr>
<tr>
Expand Down Expand Up @@ -509,7 +509,7 @@
<td>(BoolOpt) If true, the revocation list will be checked for cached tokens. This requires that PKI tokens are configured on the Keystone server.</td>
</tr>
<tr>
<td>[keystone_authtoken] hash_algorithms = ['md5']</td>
<td>[keystone_authtoken] hash_algorithms = md5</td>
<td>(ListOpt) Hash algorithms to use for hashing PKI tokens. This may be a single algorithm or multiple. The algorithms are those supported by Python standard hashlib.new(). The hashes will be tried in the order given, so put the preferred one first for performance. The result of the first hash will be stored in the cache. This will typically be set to multiple values only while migrating from a less secure algorithm to a more secure one. Once all the old tokens are expired this option should be set to a single value for better performance.</td>
</tr>
<tr>
Expand Down
9 changes: 2 additions & 7 deletions doc/common/tables/glance-conf-changes.xml
View file
Expand Up @@ -53,7 +53,7 @@
<td>(StrOpt) The path to a file which contains the metadata to be returned with any location associated with this store. The file must contain a valid JSON dict.</td>
</tr>
<tr>
<td>[glance_store] stores = ['file', 'http']</td>
<td>[glance_store] stores = file, http</td>
<td>(ListOpt) List of stores enabled</td>
</tr>
<tr>
Expand All @@ -77,7 +77,7 @@
<td>(BoolOpt) If true, the revocation list will be checked for cached tokens. This requires that PKI tokens are configured on the Keystone server.</td>
</tr>
<tr>
<td>[keystone_authtoken] hash_algorithms = ['md5']</td>
<td>[keystone_authtoken] hash_algorithms = md5</td>
<td>(ListOpt) Hash algorithms to use for hashing PKI tokens. This may be a single algorithm or multiple. The algorithms are those supported by Python standard hashlib.new(). The hashes will be tried in the order given, so put the preferred one first for performance. The result of the first hash will be stored in the cache. This will typically be set to multiple values only while migrating from a less secure algorithm to a more secure one. Once all the old tokens are expired this option should be set to a single value for better performance.</td>
</tr>
<tr>
Expand Down Expand Up @@ -118,11 +118,6 @@
<td>amqp=WARN, amqplib=WARN, boto=WARN, qpid=WARN, sqlalchemy=WARN, suds=INFO, iso8601=WARN, requests.packages.urllib3.connectionpool=WARN</td>
<td>amqp=WARN, amqplib=WARN, boto=WARN, qpid=WARN, sqlalchemy=WARN, suds=INFO, oslo.messaging=INFO, iso8601=WARN, requests.packages.urllib3.connectionpool=WARN</td>
</tr>
<tr>
<td>[DEFAULT] user_storage_quota</td>
<td>0</td>
<td>0</td>
</tr>
<tr>
<td>[DEFAULT] workers</td>
<td>1</td>
Expand Down
6 changes: 3 additions & 3 deletions doc/common/tables/heat-conf-changes.xml
View file
Expand Up @@ -133,7 +133,7 @@
<td>(BoolOpt) If true, the revocation list will be checked for cached tokens. This requires that PKI tokens are configured on the Keystone server.</td>
</tr>
<tr>
<td>[keystone_authtoken] hash_algorithms = ['md5']</td>
<td>[keystone_authtoken] hash_algorithms = md5</td>
<td>(ListOpt) Hash algorithms to use for hashing PKI tokens. This may be a single algorithm or multiple. The algorithms are those supported by Python standard hashlib.new(). The hashes will be tried in the order given, so put the preferred one first for performance. The result of the first hash will be stored in the cache. This will typically be set to multiple values only while migrating from a less secure algorithm to a more secure one. Once all the old tokens are expired this option should be set to a single value for better performance.</td>
</tr>
<tr>
Expand Down Expand Up @@ -165,7 +165,7 @@
</tr>
<tr>
<td>[DEFAULT] list_notifier_drivers</td>
<td>heat.openstack.common.notifier.no_op_notifier</td>
<td>['heat.openstack.common.notifier.no_op_notifier']</td>
<td>None</td>
</tr>
<tr>
Expand All @@ -175,7 +175,7 @@
</tr>
<tr>
<td>[database] connection</td>
<td>sqlite:////home/gpocentek/Workspace/OpenStack/openstack-doc-tools/autogenerate_config_docs/sources/heat/heat/openstack/common/db/$sqlite_db</td>
<td>sqlite:////usr/lib/python/site-packages/heat/heat/openstack/common/db/$sqlite_db</td>
<td>None</td>
</tr>
<tr>
Expand Down
8 changes: 4 additions & 4 deletions doc/common/tables/keystone-conf-changes.xml
View file
Expand Up @@ -41,7 +41,7 @@
<td>(IntOpt) Number of seconds a connection to memcached is held unused in the pool before it is closed. (keystone.cache.memcache_pool backend only)</td>
</tr>
<tr>
<td>[cache] memcache_servers = ['localhost:11211']</td>
<td>[cache] memcache_servers = localhost:11211</td>
<td>(ListOpt) Memcache servers in the format of "host:port". (dogpile.cache.memcache and keystone.cache.memcache_pool backends only)</td>
</tr>
<tr>
Expand Down Expand Up @@ -81,7 +81,7 @@
<td>(BoolOpt) If true, the revocation list will be checked for cached tokens. This requires that PKI tokens are configured on the Keystone server.</td>
</tr>
<tr>
<td>[keystone_authtoken] hash_algorithms = ['md5']</td>
<td>[keystone_authtoken] hash_algorithms = md5</td>
<td>(ListOpt) Hash algorithms to use for hashing PKI tokens. This may be a single algorithm or multiple. The algorithms are those supported by Python standard hashlib.new(). The hashes will be tried in the order given, so put the preferred one first for performance. The result of the first hash will be stored in the cache. This will typically be set to multiple values only while migrating from a less secure algorithm to a more secure one. Once all the old tokens are expired this option should be set to a single value for better performance.</td>
</tr>
<tr>
Expand Down Expand Up @@ -141,7 +141,7 @@
<td>(IntOpt) Connection pool size.</td>
</tr>
<tr>
<td>[ldap] project_additional_attribute_mapping = []</td>
<td>[ldap] project_additional_attribute_mapping = </td>
<td>(ListOpt) Additional attribute mappings for projects. Attribute mapping format is &lt;ldap_attr&gt;:&lt;user_attr&gt;, where ldap_attr is the attribute in the LDAP entry and user_attr is the Identity API attribute.</td>
</tr>
<tr>
Expand All @@ -157,7 +157,7 @@
<td>(BoolOpt) Allow project update in LDAP backend.</td>
</tr>
<tr>
<td>[ldap] project_attribute_ignore = []</td>
<td>[ldap] project_attribute_ignore = </td>
<td>(ListOpt) List of attributes stripped off the project on update.</td>
</tr>
<tr>
Expand Down
34 changes: 17 additions & 17 deletions doc/common/tables/neutron-conf-changes.xml
View file
Expand Up @@ -197,7 +197,7 @@
<td>(BoolOpt) Make the l2 agent run in DVR mode.</td>
</tr>
<tr>
<td>[AGENT] physical_interface_mappings = []</td>
<td>[AGENT] physical_interface_mappings = </td>
<td>(ListOpt) List of &lt;physical_network&gt;:&lt;physical_interface&gt;</td>
</tr>
<tr>
Expand All @@ -217,27 +217,27 @@
<td>(IntOpt) Port to connect to opencontrail controller</td>
</tr>
<tr>
<td>[HYPERV] network_vlan_ranges = []</td>
<td>[HYPERV] network_vlan_ranges = </td>
<td>(ListOpt) List of &lt;physical_network&gt;:&lt;vlan_min&gt;:&lt;vlan_max&gt; or &lt;physical_network&gt;</td>
</tr>
<tr>
<td>[HYPERV] tenant_network_type = local</td>
<td>(StrOpt) Network type for tenant networks (local, flat, vlan or none)</td>
</tr>
<tr>
<td>[NOVA] node_override_vif_distributed = []</td>
<td>[NOVA] node_override_vif_distributed = </td>
<td>(ListOpt) Nova compute nodes to manually set VIF type to distributed</td>
</tr>
<tr>
<td>[NOVA] node_override_vif_dvs = []</td>
<td>[NOVA] node_override_vif_dvs = </td>
<td>(ListOpt) Nova compute nodes to manually set VIF type to dvs</td>
</tr>
<tr>
<td>[NOVA] node_override_vif_hw_veb = []</td>
<td>[NOVA] node_override_vif_hw_veb = </td>
<td>(ListOpt) Nova compute nodes to manually set VIF type to hw_veb</td>
</tr>
<tr>
<td>[NOVA] node_override_vif_vrouter = []</td>
<td>[NOVA] node_override_vif_vrouter = </td>
<td>(ListOpt) Nova compute nodes to manually set VIF type to vrouter</td>
</tr>
<tr>
Expand All @@ -249,7 +249,7 @@
<td>(StrOpt) Domain to use for building the hostnames</td>
</tr>
<tr>
<td>[NSX_DHCP] extra_domain_name_servers = []</td>
<td>[NSX_DHCP] extra_domain_name_servers = </td>
<td>(ListOpt) Comma separated list of additional domain name servers</td>
</tr>
<tr>
Expand Down Expand Up @@ -333,11 +333,11 @@
<td>(BoolOpt) Use ipset to speed-up the iptables based security groups.</td>
</tr>
<tr>
<td>[SRIOV_NIC] exclude_devices = []</td>
<td>[SRIOV_NIC] exclude_devices = </td>
<td>(ListOpt) List of &lt;network_device&gt;:&lt;excluded_devices&gt; mapping network_device to the agent's node-specific list of virtual functions that should not be used for virtual networking. excluded_devices is a semicolon separated list of virtual functions (BDF format).to exclude from network_device. The network_device in the mapping should appear in the physical_device_mappings list.</td>
</tr>
<tr>
<td>[SRIOV_NIC] physical_device_mappings = []</td>
<td>[SRIOV_NIC] physical_device_mappings = </td>
<td>(ListOpt) List of &lt;physical_network&gt;:&lt;network_device&gt; mapping physical network names to the agent's node-specific physical network device of SR-IOV physical function to be used for VLAN networks. All physical networks listed in network_vlan_ranges on the server should have mappings to appropriate interfaces on each agent</td>
</tr>
<tr>
Expand Down Expand Up @@ -469,7 +469,7 @@
<td>(BoolOpt) If true, the revocation list will be checked for cached tokens. This requires that PKI tokens are configured on the Keystone server.</td>
</tr>
<tr>
<td>[keystone_authtoken] hash_algorithms = ['md5']</td>
<td>[keystone_authtoken] hash_algorithms = md5</td>
<td>(ListOpt) Hash algorithms to use for hashing PKI tokens. This may be a single algorithm or multiple. The algorithms are those supported by Python standard hashlib.new(). The hashes will be tried in the order given, so put the preferred one first for performance. The result of the first hash will be stored in the cache. This will typically be set to multiple values only while migrating from a less secure algorithm to a more secure one. Once all the old tokens are expired this option should be set to a single value for better performance.</td>
</tr>
<tr>
Expand Down Expand Up @@ -505,7 +505,7 @@
<td>(BoolOpt) A "True" value for this flag indicates to create a router in VRF. If not set, all routers are created in default VRF.This is optional. If not set, a value of "False" is assumed.</td>
</tr>
<tr>
<td>[ml2] extension_drivers = []</td>
<td>[ml2] extension_drivers = </td>
<td>(ListOpt) An ordered list of extension driver entrypoints to be loaded from the neutron.ml2.extension_drivers namespace.</td>
</tr>
<tr>
Expand Down Expand Up @@ -537,11 +537,11 @@
<td>(StrOpt) Name of the function profile to be created</td>
</tr>
<tr>
<td>[ml2_cisco_apic] apic_host_uplink_ports = []</td>
<td>[ml2_cisco_apic] apic_host_uplink_ports = </td>
<td>(ListOpt) The uplink ports to check for ACI connectivity</td>
</tr>
<tr>
<td>[ml2_cisco_apic] apic_hosts = []</td>
<td>[ml2_cisco_apic] apic_hosts = </td>
<td>(ListOpt) An ordered list of host names or IP addresses of the APIC controller(s).</td>
</tr>
<tr>
Expand Down Expand Up @@ -581,7 +581,7 @@
<td>(StrOpt) Range of VLAN's to be used for Openstack</td>
</tr>
<tr>
<td>[ml2_cisco_apic] apic_vpc_pairs = []</td>
<td>[ml2_cisco_apic] apic_vpc_pairs = </td>
<td>(ListOpt) The switch pairs for VPC connectivity</td>
</tr>
<tr>
Expand Down Expand Up @@ -633,7 +633,7 @@
<td>(BoolOpt) SRIOV neutron agent is required for port binding</td>
</tr>
<tr>
<td>[ml2_sriov] supported_pci_vendor_devs = ['15b3:1004', '8086:10c9']</td>
<td>[ml2_sriov] supported_pci_vendor_devs = 15b3:1004, 8086:10c9</td>
<td>(ListOpt) Supported PCI vendor devices, defined by vendor_id:product_id according to the PCI ID Repository. Default enables support for Intel and Mellanox SR-IOV capable NICs</td>
</tr>
<tr>
Expand Down Expand Up @@ -693,7 +693,7 @@
<td>(StrOpt) PLUMgrid Director admin username</td>
</tr>
<tr>
<td>[radware] actions_to_skip = ['setup_l2_l3']</td>
<td>[radware] actions_to_skip = setup_l2_l3</td>
<td>(ListOpt) List of actions that are not pushed to the completion queue.</td>
</tr>
<tr>
Expand Down Expand Up @@ -745,7 +745,7 @@
<td>(IntOpt) A required VLAN for the interswitch link to use.</td>
</tr>
<tr>
<td>[radware] service_resource_pool_ids = []</td>
<td>[radware] service_resource_pool_ids = </td>
<td>(ListOpt) Resource pool IDs.</td>
</tr>
<tr>
Expand Down
12 changes: 6 additions & 6 deletions doc/common/tables/nova-conf-changes.xml
View file
Expand Up @@ -13,7 +13,7 @@
</tr>
</thead>
<tr>
<td>[DEFAULT] baremetal_scheduler_default_filters = ['RetryFilter', 'AvailabilityZoneFilter', 'ComputeFilter', 'ComputeCapabilitiesFilter', 'ImagePropertiesFilter', 'ExactRamFilter', 'ExactDiskFilter', 'ExactCoreFilter']</td>
<td>[DEFAULT] baremetal_scheduler_default_filters = RetryFilter, AvailabilityZoneFilter, ComputeFilter, ComputeCapabilitiesFilter, ImagePropertiesFilter, ExactRamFilter, ExactDiskFilter, ExactCoreFilter</td>
<td>(ListOpt) Which filter class names to use for filtering baremetal hosts when not specified in the request.</td>
</tr>
<tr>
Expand All @@ -25,7 +25,7 @@
<td>(IntOpt) Waiting time interval (seconds) between block device allocation retries on failures</td>
</tr>
<tr>
<td>[DEFAULT] compute_resources = ['vcpu']</td>
<td>[DEFAULT] compute_resources = vcpu</td>
<td>(ListOpt) The names of the extra resources to track.</td>
</tr>
<tr>
Expand Down Expand Up @@ -97,7 +97,7 @@
<td>(IntOpt) The bit length of the encryption key to be used to encrypt ephemeral storage (in XTS mode only half of the bits are used for encryption key)</td>
</tr>
<tr>
<td>[glance] allowed_direct_url_schemes = []</td>
<td>[glance] allowed_direct_url_schemes = </td>
<td>(ListOpt) A list of url scheme that can be downloaded directly via the direct_url. Currently supported schemes: [file].</td>
</tr>
<tr>
Expand Down Expand Up @@ -173,15 +173,15 @@
<td>(BoolOpt) If true, the revocation list will be checked for cached tokens. This requires that PKI tokens are configured on the Keystone server.</td>
</tr>
<tr>
<td>[keystone_authtoken] hash_algorithms = ['md5']</td>
<td>[keystone_authtoken] hash_algorithms = md5</td>
<td>(ListOpt) Hash algorithms to use for hashing PKI tokens. This may be a single algorithm or multiple. The algorithms are those supported by Python standard hashlib.new(). The hashes will be tried in the order given, so put the preferred one first for performance. The result of the first hash will be stored in the cache. This will typically be set to multiple values only while migrating from a less secure algorithm to a more secure one. Once all the old tokens are expired this option should be set to a single value for better performance.</td>
</tr>
<tr>
<td>[keystone_authtoken] identity_uri = None</td>
<td>(StrOpt) Complete admin Identity API endpoint. This should specify the unversioned root endpoint e.g. https://localhost:35357/</td>
</tr>
<tr>
<td>[libvirt] gid_maps = []</td>
<td>[libvirt] gid_maps = </td>
<td>(ListOpt) List of guid targets and ranges.Syntax is guest-gid:host-gid:countMaximum of 5 allowed.</td>
</tr>
<tr>
Expand All @@ -201,7 +201,7 @@
<td>(StrOpt) The data source used to the populate the host "serial" UUID exposed to guest in the virtual BIOS. Permitted options are "hardware", "os", "none" or "auto" (default).</td>
</tr>
<tr>
<td>[libvirt] uid_maps = []</td>
<td>[libvirt] uid_maps = </td>
<td>(ListOpt) List of uid targets and ranges.Syntax is guest-uid:host-uid:countMaximum of 5 allowed.</td>
</tr>
<tr>
Expand Down

0 comments on commit 31de361

Please sign in to comment.