From e8fc05fce74668db9ef8348e52d454ba19e30bfb Mon Sep 17 00:00:00 2001 From: Gauvain Pocentek Date: Tue, 11 Mar 2014 18:44:02 +0100 Subject: [PATCH] update ceilometer flags and tables Change-Id: Ia25386391ffc1f626c958fce110f8c8042ffab7d --- doc/common/tables/ceilometer-alarm.xml | 2 +- doc/common/tables/ceilometer-amqp.xml | 2 +- doc/common/tables/ceilometer-api.xml | 2 +- doc/common/tables/ceilometer-auth.xml | 113 +++++++++++++++++- doc/common/tables/ceilometer-cells.xml | 63 ++++++++++ doc/common/tables/ceilometer-collector.xml | 2 +- doc/common/tables/ceilometer-common.xml | 6 +- doc/common/tables/ceilometer-database.xml | 2 +- doc/common/tables/ceilometer-events.xml | 2 +- doc/common/tables/ceilometer-exchange.xml | 2 +- doc/common/tables/ceilometer-inspector.xml | 2 +- doc/common/tables/ceilometer-logging.xml | 21 +++- doc/common/tables/ceilometer-qpid.xml | 2 +- doc/common/tables/ceilometer-rabbitmq.xml | 2 +- doc/common/tables/ceilometer-redis.xml | 2 +- doc/common/tables/ceilometer-rpc.xml | 2 +- doc/common/tables/ceilometer-ssl.xml | 2 +- doc/common/tables/ceilometer-swift.xml | 2 +- doc/common/tables/ceilometer-vmware.xml | 43 +++++++ .../ceilometer.flagmappings | 77 +++++++++--- 20 files changed, 314 insertions(+), 37 deletions(-) create mode 100644 doc/common/tables/ceilometer-cells.xml create mode 100644 doc/common/tables/ceilometer-vmware.xml diff --git a/doc/common/tables/ceilometer-alarm.xml b/doc/common/tables/ceilometer-alarm.xml index c8bfe9a18c..d1a4e966b7 100644 --- a/doc/common/tables/ceilometer-alarm.xml +++ b/doc/common/tables/ceilometer-alarm.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> - +
diff --git a/doc/common/tables/ceilometer-amqp.xml b/doc/common/tables/ceilometer-amqp.xml index ea51886434..d32640d5a6 100644 --- a/doc/common/tables/ceilometer-amqp.xml +++ b/doc/common/tables/ceilometer-amqp.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for alarm
+
diff --git a/doc/common/tables/ceilometer-api.xml b/doc/common/tables/ceilometer-api.xml index 030cf01645..777a33b55e 100644 --- a/doc/common/tables/ceilometer-api.xml +++ b/doc/common/tables/ceilometer-api.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for amqp
+
diff --git a/doc/common/tables/ceilometer-auth.xml b/doc/common/tables/ceilometer-auth.xml index c8dfb5aad8..26d2b32459 100644 --- a/doc/common/tables/ceilometer-auth.xml +++ b/doc/common/tables/ceilometer-auth.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for api
+
@@ -22,6 +22,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/doc/common/tables/ceilometer-cells.xml b/doc/common/tables/ceilometer-cells.xml new file mode 100644 index 0000000000..a45a33573e --- /dev/null +++ b/doc/common/tables/ceilometer-cells.xml @@ -0,0 +1,63 @@ + + + +
Description of configuration options for auth
auth_strategy = keystone (StrOpt) The strategy to use for auth: noauth or keystone.
[keystone_authtoken]
admin_password = None(StrOpt) Keystone account password
admin_tenant_name = admin(StrOpt) Keystone service account tenant name to validate user tokens
admin_token = None(StrOpt) Single shared secret with the Keystone configuration used for bootstrapping a Keystone installation, or otherwise bypassing the normal authentication process.
admin_user = None(StrOpt) Keystone account username
auth_admin_prefix = (StrOpt) Prefix to prepend at the beginning of the path
auth_host = 127.0.0.1(StrOpt) Host providing the admin Identity API endpoint
auth_port = 35357(IntOpt) Port of the admin Identity API endpoint
auth_protocol = https(StrOpt) Protocol of the admin Identity API endpoint(http or https)
auth_uri = None(StrOpt) Complete public Identity API endpoint
auth_version = None(StrOpt) API version of the admin Identity API endpoint
cache = None(StrOpt) Env key for the swift cache
cafile = None(StrOpt) A PEM encoded Certificate Authority to use when verifying HTTPs connections. Defaults to system CAs.
certfile = None(StrOpt) Required if Keystone server requires client certificate
delay_auth_decision = False(BoolOpt) Do not handle authorization requests within the middleware, but delegate the authorization decision to downstream WSGI components
enforce_token_bind = permissive(StrOpt) Used to control the use and type of token binding. Can be set to: "disabled" to not check token binding. "permissive" (default) to validate binding information if the bind type is of a form known to the server and ignore it if not. "strict" like "permissive" but if the bind type is unknown the token will be rejected. "required" any form of token binding is needed to be allowed. Finally the name of a binding method that must be present in tokens.
http_connect_timeout = None(BoolOpt) Request timeout value for communicating with Identity API server.
http_handler = None(StrOpt) Allows to pass in the name of a fake http_handler callback function used instead of httplib.HTTPConnection or httplib.HTTPSConnection. Useful for unit testing where network is not available.
http_request_max_retries = 3(IntOpt) How many times are we trying to reconnect when communicating with Identity API Server.
include_service_catalog = True(BoolOpt) (optional) indicate whether to set the X-Service-Catalog header. If False, middleware will not ask for service catalog on token validation and will not set the X-Service-Catalog header.
insecure = False(BoolOpt) Verify HTTPS connections.
keyfile = None(StrOpt) Required if Keystone server requires client certificate
memcache_secret_key = None(StrOpt) (optional, mandatory if memcache_security_strategy is defined) this string is used for key derivation.
memcache_security_strategy = None(StrOpt) (optional) if defined, indicate whether token data should be authenticated or authenticated and encrypted. Acceptable values are MAC or ENCRYPT. If MAC, token data is authenticated (with HMAC) in the cache. If ENCRYPT, token data is encrypted and authenticated in the cache. If the value is not one of these options or empty, auth_token will raise an exception on initialization.
memcached_servers = None(ListOpt) If defined, the memcache server(s) to use for caching
revocation_cache_time = 1(IntOpt) Value only used for unit testing
signing_dir = None(StrOpt) Directory used to cache files related to PKI tokens
token_cache_time = 300(IntOpt) In order to prevent excessive requests and validations, the middleware uses an in-memory cache for the tokens the Keystone API returns. This is only valid if memcache_servers is defined. Set to -1 to disable caching completely.
[service_credentials]
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of configuration options for cells
Configuration option = Default valueDescription
[cells]
bandwidth_update_interval = 600(IntOpt) Seconds between bandwidth updates for cells.
call_timeout = 60(IntOpt) Seconds to wait for response from a call to a cell.
capabilities = hypervisor=xenserver;kvm, os=linux;windows(ListOpt) Key/Multi-value list with the capabilities of the cell
cell_type = compute(StrOpt) Type of cell: api or compute
enable = False(BoolOpt) Enable cell functionality
manager = nova.cells.manager.CellsManager(StrOpt) Manager for cells
mute_child_interval = 300(IntOpt) Number of seconds after which a lack of capability and capacity updates signals the child cell is to be treated as a mute.
name = nova(StrOpt) Name of this cell
reserve_percent = 10.0(FloatOpt) Percentage of cell capacity to hold in reserve. Affects both memory and disk utilization
topic = cells(StrOpt) The topic cells nodes listen on
+ diff --git a/doc/common/tables/ceilometer-collector.xml b/doc/common/tables/ceilometer-collector.xml index be2bc5809c..b56df8ba8e 100644 --- a/doc/common/tables/ceilometer-collector.xml +++ b/doc/common/tables/ceilometer-collector.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> - +
diff --git a/doc/common/tables/ceilometer-common.xml b/doc/common/tables/ceilometer-common.xml index 92914010ae..7f9c0c426d 100644 --- a/doc/common/tables/ceilometer-common.xml +++ b/doc/common/tables/ceilometer-common.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for collector
+
@@ -34,6 +34,10 @@ + + + +
Description of configuration options for common
lock_path = None (StrOpt) Directory to use for lock files.
memcached_servers = None(ListOpt) Memcached servers or None for in process cache.
diff --git a/doc/common/tables/ceilometer-database.xml b/doc/common/tables/ceilometer-database.xml index 3b8ccbcf61..58d9684b1b 100644 --- a/doc/common/tables/ceilometer-database.xml +++ b/doc/common/tables/ceilometer-database.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> - +
diff --git a/doc/common/tables/ceilometer-events.xml b/doc/common/tables/ceilometer-events.xml index 51aeb67773..756f8fbc51 100644 --- a/doc/common/tables/ceilometer-events.xml +++ b/doc/common/tables/ceilometer-events.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for database
+
diff --git a/doc/common/tables/ceilometer-exchange.xml b/doc/common/tables/ceilometer-exchange.xml index a164b7fe3d..ff250f0f4d 100644 --- a/doc/common/tables/ceilometer-exchange.xml +++ b/doc/common/tables/ceilometer-exchange.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for events
+
diff --git a/doc/common/tables/ceilometer-inspector.xml b/doc/common/tables/ceilometer-inspector.xml index 1f57fbaa6b..0183d71d94 100644 --- a/doc/common/tables/ceilometer-inspector.xml +++ b/doc/common/tables/ceilometer-inspector.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for exchange
+
diff --git a/doc/common/tables/ceilometer-logging.xml b/doc/common/tables/ceilometer-logging.xml index 5072c310e2..b866ac1334 100644 --- a/doc/common/tables/ceilometer-logging.xml +++ b/doc/common/tables/ceilometer-logging.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for inspector
+
@@ -82,6 +82,10 @@ + + + + @@ -90,14 +94,21 @@ - - - - + + + + + + + + + + +
Description of configuration options for logging
syslog-log-facility = LOG_USER (StrOpt) Syslog facility to receive log lines
use_stderr = True(BoolOpt) Log output to standard error
use-syslog = False (BoolOpt) Use syslog for logging. Existing syslog format is DEPRECATED during I, and then will be changed in J to honor RFC5424use-syslog-rfc-format = False (BoolOpt) (Optional) Use syslog rfc5424 format for logging. If enabled, will add APP-NAME (RFC5424) before the MSG part of the syslog message. The old format without APP-NAME is deprecated in I, and will be removed in J.
use_stderr = True(BoolOpt) Log output to standard error
verbose = False (BoolOpt) Print more verbose output (set logging level to INFO instead of default WARNING level).
[audit]
api_audit_map = api_audit_map.conf(StrOpt) File containing mapping for api paths and service endpoints
namespace = openstack(StrOpt) namespace prefix for generated id
diff --git a/doc/common/tables/ceilometer-qpid.xml b/doc/common/tables/ceilometer-qpid.xml index d0ec72f3a8..4c980944e3 100644 --- a/doc/common/tables/ceilometer-qpid.xml +++ b/doc/common/tables/ceilometer-qpid.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> - +
diff --git a/doc/common/tables/ceilometer-rabbitmq.xml b/doc/common/tables/ceilometer-rabbitmq.xml index 123c0483be..789cb3cb5a 100644 --- a/doc/common/tables/ceilometer-rabbitmq.xml +++ b/doc/common/tables/ceilometer-rabbitmq.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for qpid
+
diff --git a/doc/common/tables/ceilometer-redis.xml b/doc/common/tables/ceilometer-redis.xml index b0ec7cab3f..7083301f22 100644 --- a/doc/common/tables/ceilometer-redis.xml +++ b/doc/common/tables/ceilometer-redis.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for rabbitmq
+
diff --git a/doc/common/tables/ceilometer-rpc.xml b/doc/common/tables/ceilometer-rpc.xml index a9adf59140..50b1f07385 100644 --- a/doc/common/tables/ceilometer-rpc.xml +++ b/doc/common/tables/ceilometer-rpc.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for redis
+
diff --git a/doc/common/tables/ceilometer-ssl.xml b/doc/common/tables/ceilometer-ssl.xml index 37daeffd30..52108ab589 100644 --- a/doc/common/tables/ceilometer-ssl.xml +++ b/doc/common/tables/ceilometer-ssl.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for rpc
+
diff --git a/doc/common/tables/ceilometer-swift.xml b/doc/common/tables/ceilometer-swift.xml index 93ab5b862e..7b39c818d1 100644 --- a/doc/common/tables/ceilometer-swift.xml +++ b/doc/common/tables/ceilometer-swift.xml @@ -4,7 +4,7 @@ The tool to do so lives in the tools directory of this repository --> -
Description of configuration options for ssl
+
diff --git a/doc/common/tables/ceilometer-vmware.xml b/doc/common/tables/ceilometer-vmware.xml new file mode 100644 index 0000000000..8c0f406cc5 --- /dev/null +++ b/doc/common/tables/ceilometer-vmware.xml @@ -0,0 +1,43 @@ + + + +
Description of configuration options for swift
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of configuration options for vmware
Configuration option = Default valueDescription
[vmware]
api_retry_count = 10(IntOpt) Number of times a VMware Vsphere API must be retried
host_ip = (StrOpt) IP address of the VMware Vsphere host
host_password = (StrOpt) Password of VMware Vsphere
host_username = (StrOpt) Username of VMware Vsphere
task_poll_interval = 0.5(FloatOpt) Sleep time in seconds for polling an ongoing async task
+ diff --git a/tools/autogenerate-config-flagmappings/ceilometer.flagmappings b/tools/autogenerate-config-flagmappings/ceilometer.flagmappings index dee83b8a92..b88734f5d8 100644 --- a/tools/autogenerate-config-flagmappings/ceilometer.flagmappings +++ b/tools/autogenerate-config-flagmappings/ceilometer.flagmappings @@ -29,11 +29,11 @@ kombu_ssl_version rabbitmq libvirt_type inspector libvirt_uri inspector lock_path common -log-config-append logging -log-date-format logging -log-dir logging -log-file logging -log-format logging +log_config_append logging +log_date_format logging +log_dir logging +log_file logging +log_format logging logging_context_format_string logging logging_debug_format_suffix logging logging_default_format_string logging @@ -41,6 +41,7 @@ logging_exception_prefix logging matchmaker_heartbeat_freq redis matchmaker_heartbeat_ttl redis max_request_body_size api +memcached_servers common mysql_engine database neutron_control_exchange exchange notification_driver amqp @@ -89,10 +90,10 @@ rpc_zmq_topic_backlog rpc sample_source exchange sqlite_db database sqlite_synchronous database -syslog-log-facility logging -use-syslog logging -use-syslog-rfc-format logging +syslog_log_facility logging use_stderr logging +use_syslog logging +use_syslog_rfc_format logging verbose logging alarm/evaluation_interval alarm alarm/evaluation_service alarm @@ -104,6 +105,18 @@ alarm/rest_notifier_certificate_key alarm alarm/rest_notifier_ssl_verify alarm api/host api api/port api +audit/api_audit_map logging +audit/namespace logging +cells/bandwidth_update_interval cells +cells/call_timeout cells +cells/capabilities cells +cells/cell_type cells +cells/enable cells +cells/manager cells +cells/mute_child_interval cells +cells/name cells +cells/reserve_percent cells +cells/topic cells collector/udp_address collector collector/udp_port collector database/backend database @@ -124,6 +137,33 @@ dispatcher_file/file_path collector dispatcher_file/max_bytes collector event/definitions_cfg_file events event/drop_unmatched_notifications events +keystone_authtoken/admin_password auth +keystone_authtoken/admin_tenant_name auth +keystone_authtoken/admin_token auth +keystone_authtoken/admin_user auth +keystone_authtoken/auth_admin_prefix auth +keystone_authtoken/auth_host auth +keystone_authtoken/auth_port auth +keystone_authtoken/auth_protocol auth +keystone_authtoken/auth_uri auth +keystone_authtoken/auth_version auth +keystone_authtoken/cache auth +keystone_authtoken/cafile auth +keystone_authtoken/certfile auth +keystone_authtoken/delay_auth_decision auth +keystone_authtoken/enforce_token_bind auth +keystone_authtoken/http_connect_timeout auth +keystone_authtoken/http_handler auth +keystone_authtoken/http_request_max_retries auth +keystone_authtoken/include_service_catalog auth +keystone_authtoken/insecure auth +keystone_authtoken/keyfile auth +keystone_authtoken/memcache_secret_key auth +keystone_authtoken/memcache_security_strategy auth +keystone_authtoken/memcached_servers auth +keystone_authtoken/revocation_cache_time auth +keystone_authtoken/signing_dir auth +keystone_authtoken/token_cache_time auth matchmaker_redis/host redis matchmaker_redis/password redis matchmaker_redis/port redis @@ -134,14 +174,19 @@ publisher/metering_secret rpc publisher_rpc/metering_topic rpc rpc_notifier2/topics rpc service_credentials/insecure auth -service_credentials/os-auth-url auth -service_credentials/os-cacert auth -service_credentials/os-endpoint-type auth -service_credentials/os-password auth -service_credentials/os-region-name auth -service_credentials/os-tenant-id auth -service_credentials/os-tenant-name auth -service_credentials/os-username auth +service_credentials/os_auth_url auth +service_credentials/os_cacert auth +service_credentials/os_endpoint_type auth +service_credentials/os_password auth +service_credentials/os_region_name auth +service_credentials/os_tenant_id auth +service_credentials/os_tenant_name auth +service_credentials/os_username auth ssl/ca_file ssl ssl/cert_file ssl ssl/key_file ssl +vmware/api_retry_count vmware +vmware/host_ip vmware +vmware/host_password vmware +vmware/host_username vmware +vmware/task_poll_interval vmware