[config-ref] update murano config options for Ocata

Change-Id: Ic5e905821381ae5f1286ba310f36a28740599250

doc/config-reference/source/application-catalog/config-options.rst

@@ -6,6 +6,7 @@ These options can also be set in the ``murano.conf`` file.
 
 .. include:: ../tables/murano-common.rst
 .. include:: ../tables/murano-engine.rst
+.. include:: ../tables/murano-glance.rst
 .. include:: ../tables/murano-glare.rst
 .. include:: ../tables/murano-heat.rst
 .. include:: ../tables/murano-mistral.rst

doc/config-reference/source/tables/murano-api.rst

@@ -39,7 +39,7 @@
    * - ``policy_dirs`` = ``['policy.d']``
      - (Multi-valued) Directories where policy configuration files are stored. They can be relative to any directory in the search path defined by the config_dir option, or absolute paths. The file defined by policy_file must exist for these directories to be searched. Missing or empty directories are ignored.
    * - ``policy_file`` = ``policy.json``
-     - (String) The JSON file that defines policies.
+     - (String) The file that defines policies.
    * - **[paste_deploy]**
      -
    * - ``config_file`` = ``None``

doc/config-reference/source/tables/murano-common.rst

@@ -36,8 +36,20 @@
      - (Boolean) Enables or disables publication of error events.
    * - ``tcp_keepidle`` = ``600``
      - (Integer) Sets the value of TCP_KEEPIDLE in seconds for each server socket. Not supported on OS X.
-   * - ``use_router_proxy`` = ``True``
+   * - ``use_router_proxy`` = ``False``
      - (Boolean) Use ROUTER remote proxy.
+   * - **[healthcheck]**
+     -
+   * - ``backends`` =
+     - (List) Additional backends that can perform health checks and report that information back as part of a request.
+   * - ``detailed`` = ``False``
+     - (Boolean) Show more detailed information as part of the response
+   * - ``disable_by_file_path`` = ``None``
+     - (String) Check the presence of a file to determine if an application is running on a port. Used by DisableByFileHealthcheck plugin.
+   * - ``disable_by_file_paths`` =
+     - (List) Check the presence of a file based on a port to determine if an application is running on a port. Expects a "port:path" list of strings. Used by DisableByFilesPortsHealthcheck plugin.
+   * - ``path`` = ``/healthcheck``
+     - (String) DEPRECATED: The path to respond to healtcheck requests on.
    * - **[murano]**
      -
    * - ``api_limit_max`` = ``100``

doc/config-reference/source/tables/murano-glance.rst

@@ -0,0 +1,32 @@
+..
+    Warning: Do not edit this file. It is automatically generated from the
+    software project's code and your changes will be overwritten.
+
+    The tool to generate this file lives in openstack-doc-tools repository.
+
+    Please make any changes needed in the code, then run the
+    autogenerate-config-doc tool from the openstack-doc-tools repository, or
+    ask for help on the documentation mailing list, IRC channel or meeting.
+
+.. _murano-glance:
+
+.. list-table:: Description of glance configuration options
+   :header-rows: 1
+   :class: config-ref-table
+
+   * - Configuration option = Default value
+     - Description
+   * - **[glance]**
+     -
+   * - ``ca_file`` = ``None``
+     - (String) (SSL) Tells Murano to use the specified certificate file to verify the peer running Glance API.
+   * - ``cert_file`` = ``None``
+     - (String) (SSL) Tells Murano to use the specified client certificate file when communicating with Glance.
+   * - ``endpoint_type`` = ``publicURL``
+     - (String) Glance endpoint type.
+   * - ``insecure`` = ``False``
+     - (Boolean) This option explicitly allows Murano to perform "insecure" SSL connections and transfers with Glance API.
+   * - ``key_file`` = ``None``
+     - (String) (SSL/SSH) Private key file name to communicate with Glance API.
+   * - ``url`` = ``None``
+     - (String) Optional glance endpoint override

doc/config-reference/source/tables/murano-redis.rst

@@ -29,8 +29,8 @@
    * - ``sentinel_group_name`` = ``oslo-messaging-zeromq``
      - (String) Redis replica set name.
    * - ``sentinel_hosts`` =
-     - (List) DEPRECATED: List of Redis Sentinel hosts (fault tolerance mode) e.g. [host:port, host1:port ... ] Replaced by [DEFAULT]/transport_url
+     - (List) DEPRECATED: List of Redis Sentinel hosts (fault tolerance mode), e.g., [host:port, host1:port ... ] Replaced by [DEFAULT]/transport_url
    * - ``socket_timeout`` = ``10000``
-     - (Integer) Timeout in ms on blocking socket operations
+     - (Integer) Timeout in ms on blocking socket operations.
    * - ``wait_timeout`` = ``2000``
      - (Integer) Time in ms to wait between connection attempts.

tools/autogenerate-config-flagmappings/murano.flagmappings

@@ -25,11 +25,19 @@ logging_user_identity_format disable
 max_header_line api
 metadata_dir common
 publish_errors common
+rate_limit_burst disable
+rate_limit_except_level disable
+rate_limit_interval disable
+rpc_ack_timeout_base disable
+rpc_ack_timeout_multiplier disable
 rpc_backend disable
-rpc_cast_timeout disable
 rpc_conn_pool_size disable
+rpc_message_ttl disable
 rpc_poll_timeout disable
 rpc_response_timeout disable
+rpc_retry_attempts disable
+rpc_thread_pool_size disable
+rpc_use_acks disable
 rpc_zmq_bind_address disable
 rpc_zmq_bind_port_retries disable
 rpc_zmq_contexts disable
@@ -41,18 +49,26 @@ rpc_zmq_min_port disable
 rpc_zmq_serialization disable
 rpc_zmq_topic_backlog disable
 secure_proxy_ssl_header api
+subscribe_on disable
 syslog_log_facility disable
 tcp_keepidle common
 transport_url disable
+use_dynamic_connections disable
 use_pub_sub disable
 use_router_proxy common
 use_stderr disable
 use_syslog disable
 verbose disable
 watch_log_file disable
+zmq_failover_connections disable
 zmq_immediate disable
+zmq_linger disable
 zmq_target_expire disable
 zmq_target_update disable
+zmq_tcp_keepalive disable
+zmq_tcp_keepalive_cnt disable
+zmq_tcp_keepalive_idle disable
+zmq_tcp_keepalive_intvl disable
 cfapi/auth_url cfapi
 cfapi/bind_host cfapi
 cfapi/bind_port cfapi
@@ -102,12 +118,23 @@ engine/load_packages_from engine
 engine/packages_cache engine
 engine/packages_service engine
 engine/use_trusts engine
+glance/ca_file glance
+glance/cert_file glance
+glance/endpoint_type glance
+glance/insecure glance
+glance/key_file glance
+glance/url glance
 glare/ca_file glare
 glare/cert_file glare
 glare/endpoint_type glare
 glare/insecure glare
 glare/key_file glare
 glare/url glare
+healthcheck/backends common
+healthcheck/detailed common
+healthcheck/disable_by_file_path common
+healthcheck/disable_by_file_paths common
+healthcheck/path common
 heat/ca_file heat
 heat/cert_file heat
 heat/endpoint_type heat
@@ -151,6 +178,8 @@ keystone_authtoken/memcache_use_advanced_pool disable
 keystone_authtoken/memcached_servers disable
 keystone_authtoken/region_name disable
 keystone_authtoken/revocation_cache_time disable
+keystone_authtoken/service_token_roles disable
+keystone_authtoken/service_token_roles_required disable
 keystone_authtoken/signing_dir disable
 keystone_authtoken/token_cache_time disable
 matchmaker_redis/check_timeout redis
@@ -202,9 +231,11 @@ oslo_messaging_amqp/connection_retry_interval_max disable
 oslo_messaging_amqp/container_name disable
 oslo_messaging_amqp/default_notification_exchange disable
 oslo_messaging_amqp/default_notify_timeout disable
+oslo_messaging_amqp/default_reply_retry disable
 oslo_messaging_amqp/default_reply_timeout disable
 oslo_messaging_amqp/default_rpc_exchange disable
 oslo_messaging_amqp/default_send_timeout disable
+oslo_messaging_amqp/default_sender_link_timeout disable
 oslo_messaging_amqp/group_request_prefix disable
 oslo_messaging_amqp/idle_timeout disable
 oslo_messaging_amqp/link_retry_delay disable
@@ -212,6 +243,7 @@ oslo_messaging_amqp/multicast_address disable
 oslo_messaging_amqp/notify_address_prefix disable
 oslo_messaging_amqp/notify_server_credit disable
 oslo_messaging_amqp/password disable
+oslo_messaging_amqp/pre_settled disable
 oslo_messaging_amqp/reply_link_credit disable
 oslo_messaging_amqp/rpc_address_prefix disable
 oslo_messaging_amqp/rpc_server_credit disable
@@ -226,6 +258,16 @@ oslo_messaging_amqp/ssl_key_password disable
 oslo_messaging_amqp/trace disable
 oslo_messaging_amqp/unicast_address disable
 oslo_messaging_amqp/username disable
+oslo_messaging_kafka/conn_pool_min_size disable
+oslo_messaging_kafka/conn_pool_ttl disable
+oslo_messaging_kafka/consumer_group disable
+oslo_messaging_kafka/kafka_consumer_timeout disable
+oslo_messaging_kafka/kafka_default_host disable
+oslo_messaging_kafka/kafka_default_port disable
+oslo_messaging_kafka/kafka_max_fetch_bytes disable
+oslo_messaging_kafka/pool_size disable
+oslo_messaging_kafka/producer_batch_size disable
+oslo_messaging_kafka/producer_batch_timeout disable
 oslo_messaging_notifications/driver disable
 oslo_messaging_notifications/topics disable
 oslo_messaging_notifications/transport_url disable
@@ -237,6 +279,7 @@ oslo_messaging_rabbit/default_notification_exchange disable
 oslo_messaging_rabbit/default_notification_retry_attempts disable
 oslo_messaging_rabbit/default_rpc_exchange disable
 oslo_messaging_rabbit/default_rpc_retry_attempts disable
+oslo_messaging_rabbit/default_serializer_type disable
 oslo_messaging_rabbit/fake_rabbit disable
 oslo_messaging_rabbit/frame_max disable
 oslo_messaging_rabbit/heartbeat_interval disable
@@ -285,8 +328,13 @@ oslo_messaging_rabbit/socket_timeout disable
 oslo_messaging_rabbit/ssl disable
 oslo_messaging_rabbit/ssl_options disable
 oslo_messaging_rabbit/tcp_user_timeout disable
-oslo_messaging_zmq/rpc_cast_timeout disable
+oslo_messaging_zmq/rpc_ack_timeout_base disable
+oslo_messaging_zmq/rpc_ack_timeout_multiplier disable
+oslo_messaging_zmq/rpc_message_ttl disable
 oslo_messaging_zmq/rpc_poll_timeout disable
+oslo_messaging_zmq/rpc_retry_attempts disable
+oslo_messaging_zmq/rpc_thread_pool_size disable
+oslo_messaging_zmq/rpc_use_acks disable
 oslo_messaging_zmq/rpc_zmq_bind_address disable
 oslo_messaging_zmq/rpc_zmq_bind_port_retries disable
 oslo_messaging_zmq/rpc_zmq_contexts disable
@@ -297,11 +345,19 @@ oslo_messaging_zmq/rpc_zmq_max_port disable
 oslo_messaging_zmq/rpc_zmq_min_port disable
 oslo_messaging_zmq/rpc_zmq_serialization disable
 oslo_messaging_zmq/rpc_zmq_topic_backlog disable
+oslo_messaging_zmq/subscribe_on disable
+oslo_messaging_zmq/use_dynamic_connections disable
 oslo_messaging_zmq/use_pub_sub disable
 oslo_messaging_zmq/use_router_proxy disable
+oslo_messaging_zmq/zmq_failover_connections disable
 oslo_messaging_zmq/zmq_immediate disable
+oslo_messaging_zmq/zmq_linger disable
 oslo_messaging_zmq/zmq_target_expire disable
 oslo_messaging_zmq/zmq_target_update disable
+oslo_messaging_zmq/zmq_tcp_keepalive disable
+oslo_messaging_zmq/zmq_tcp_keepalive_cnt disable
+oslo_messaging_zmq/zmq_tcp_keepalive_idle disable
+oslo_messaging_zmq/zmq_tcp_keepalive_intvl disable
 oslo_middleware/enable_proxy_headers_parsing api
 oslo_middleware/max_request_body_size api
 oslo_middleware/secure_proxy_ssl_header api

tools/autogenerate-config-flagmappings/murano.headers

@@ -5,6 +5,7 @@ common common
 cors CORS
 database database
 engine engine
+glance glance
 glare glare
 heat Orchestration service
 logging logging