diff --git a/doc/config-reference/source/bare-metal/config-options.rst b/doc/config-reference/source/bare-metal/config-options.rst index 42e7ecad55..3e24b30d06 100644 --- a/doc/config-reference/source/bare-metal/config-options.rst +++ b/doc/config-reference/source/bare-metal/config-options.rst @@ -8,7 +8,6 @@ service configuration options. .. include:: ../tables/ironic-agent.rst .. include:: ../tables/ironic-amt.rst .. include:: ../tables/ironic-audit.rst -.. include:: ../tables/ironic-auth.rst .. include:: ../tables/ironic-cisco_ucs.rst .. include:: ../tables/ironic-common.rst .. include:: ../tables/ironic-conductor.rst diff --git a/doc/config-reference/source/tables/ironic-auth.rst b/doc/config-reference/source/tables/ironic-auth.rst deleted file mode 100644 index 909ce89477..0000000000 --- a/doc/config-reference/source/tables/ironic-auth.rst +++ /dev/null @@ -1,22 +0,0 @@ -.. - 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. - -.. _ironic-auth: - -.. list-table:: Description of authorization configuration options - :header-rows: 1 - :class: config-ref-table - - * - Configuration option = Default value - - Description - * - **[DEFAULT]** - - - * - ``auth_strategy`` = ``keystone`` - - (String) Authentication strategy used by ironic-api. "noauth" should not be used in a production environment because all authentication will be disabled. diff --git a/doc/config-reference/source/tables/ironic-iSCSI.rst b/doc/config-reference/source/tables/ironic-iSCSI.rst deleted file mode 100644 index 26f7db33cf..0000000000 --- a/doc/config-reference/source/tables/ironic-iSCSI.rst +++ /dev/null @@ -1,22 +0,0 @@ -.. - 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. - -.. _ironic-iSCSI: - -.. list-table:: Description of iSCSI configuration options - :header-rows: 1 - :class: config-ref-table - - * - Configuration option = Default value - - Description - * - **[iscsi]** - - - * - ``portal_port`` = ``3260`` - - (Port number) The port number on which the iSCSI portal listens for incoming connections. diff --git a/doc/config-reference/source/tables/ironic-rpc.rst b/doc/config-reference/source/tables/ironic-rpc.rst deleted file mode 100644 index eb828f29d5..0000000000 --- a/doc/config-reference/source/tables/ironic-rpc.rst +++ /dev/null @@ -1,30 +0,0 @@ -.. - 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. - -.. _ironic-rpc: - -.. list-table:: Description of RPC configuration options - :header-rows: 1 - :class: config-ref-table - - * - Configuration option = Default value - - Description - * - **[DEFAULT]** - - - * - ``rpc_backend`` = ``rabbit`` - - (String) DEPRECATED: The messaging driver to use, defaults to rabbit. Other drivers include amqp and zmq. Replaced by [DEFAULT]/transport_url - * - ``rpc_cast_timeout`` = ``-1`` - - (Integer) Seconds to wait before a cast expires (TTL). The default value of -1 specifies an infinite linger period. The value of 0 specifies no linger period. Pending messages shall be discarded immediately when the socket is closed. Only supported by impl_zmq. - * - ``rpc_conn_pool_size`` = ``30`` - - (Integer) Size of RPC connection pool. - * - ``rpc_poll_timeout`` = ``1`` - - (Integer) The default number of seconds that poll should wait. Poll raises timeout exception when timeout expired. - * - ``rpc_response_timeout`` = ``60`` - - (Integer) Seconds to wait for a response from a call. diff --git a/doc/config-reference/source/tables/ironic-zeromq.rst b/doc/config-reference/source/tables/ironic-zeromq.rst deleted file mode 100644 index 5b0d0d4e5f..0000000000 --- a/doc/config-reference/source/tables/ironic-zeromq.rst +++ /dev/null @@ -1,40 +0,0 @@ -.. - 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. - -.. _ironic-zeromq: - -.. list-table:: Description of ZeroMQ configuration options - :header-rows: 1 - :class: config-ref-table - - * - Configuration option = Default value - - Description - * - **[DEFAULT]** - - - * - ``rpc_zmq_bind_address`` = ``*`` - - (String) ZeroMQ bind address. Should be a wildcard (*), an ethernet interface, or IP. The "host" option should point or resolve to this address. - * - ``rpc_zmq_bind_port_retries`` = ``100`` - - (Integer) Number of retries to find free port number before fail with ZMQBindError. - * - ``rpc_zmq_contexts`` = ``1`` - - (Integer) Number of ZeroMQ contexts, defaults to 1. - * - ``rpc_zmq_host`` = ``localhost`` - - (String) Name of this node. Must be a valid hostname, FQDN, or IP address. Must match "host" option, if running Nova. - * - ``rpc_zmq_ipc_dir`` = ``/var/run/openstack`` - - (String) Directory for holding IPC sockets. - * - ``rpc_zmq_matchmaker`` = ``redis`` - - (String) MatchMaker driver. - * - ``rpc_zmq_max_port`` = ``65536`` - - (Integer) Maximal port number for random ports range. - * - ``rpc_zmq_min_port`` = ``49153`` - - (Port number) Minimal port number for random ports range. - * - ``rpc_zmq_serialization`` = ``json`` - - (String) Default serialization mechanism for serializing/deserializing outgoing/incoming messages - * - ``rpc_zmq_topic_backlog`` = ``None`` - - (Integer) Maximum number of ingress messages to locally buffer per topic. Default is unlimited. diff --git a/tools/autogenerate-config-flagmappings/ironic.flagmappings b/tools/autogenerate-config-flagmappings/ironic.flagmappings index daed1fd1d3..9a5927c532 100644 --- a/tools/autogenerate-config-flagmappings/ironic.flagmappings +++ b/tools/autogenerate-config-flagmappings/ironic.flagmappings @@ -1,4 +1,4 @@ -auth_strategy auth +auth_strategy disable bindir common conn_pool_min_size disable conn_pool_ttl disable @@ -38,21 +38,21 @@ pecan_debug debug publish_errors disable pybasedir common rootwrap_config common -rpc_backend rpc -rpc_cast_timeout rpc -rpc_conn_pool_size rpc -rpc_poll_timeout rpc -rpc_response_timeout rpc -rpc_zmq_bind_address zeromq -rpc_zmq_bind_port_retries zeromq -rpc_zmq_contexts zeromq -rpc_zmq_host zeromq -rpc_zmq_ipc_dir zeromq -rpc_zmq_matchmaker zeromq -rpc_zmq_max_port zeromq -rpc_zmq_min_port zeromq -rpc_zmq_serialization zeromq -rpc_zmq_topic_backlog zeromq +rpc_backend disable +rpc_cast_timeout disable +rpc_conn_pool_size disable +rpc_poll_timeout disable +rpc_response_timeout disable +rpc_zmq_bind_address disable +rpc_zmq_bind_port_retries disable +rpc_zmq_contexts disable +rpc_zmq_host disable +rpc_zmq_ipc_dir disable +rpc_zmq_matchmaker disable +rpc_zmq_max_port disable +rpc_zmq_min_port disable +rpc_zmq_serialization disable +rpc_zmq_topic_backlog disable state_path common syslog_log_facility disable tempdir common