diff --git a/doc/config-ref-rst/source/block-storage.rst b/doc/config-ref-rst/source/block-storage.rst index 262e8ee5c3..b706a9512e 100644 --- a/doc/config-ref-rst/source/block-storage.rst +++ b/doc/config-ref-rst/source/block-storage.rst @@ -13,7 +13,7 @@ Block Storage block-storage/fc-zoning.rst block-storage/volume-encryption.rst block-storage/volume-misc.rst - block-storage/cinder-conf-changes-liberty.rst + tables/conf-changes/cinder.rst The OpenStack Block Storage service works with many different storage drivers that you can configure by using these instructions. diff --git a/doc/config-ref-rst/source/block-storage/cinder-conf-changes-liberty.rst b/doc/config-ref-rst/source/block-storage/cinder-conf-changes-liberty.rst deleted file mode 100644 index 8ffc2b6ea9..0000000000 --- a/doc/config-ref-rst/source/block-storage/cinder-conf-changes-liberty.rst +++ /dev/null @@ -1,3 +0,0 @@ -=========================================================================== -New, updated, and deprecated options in Liberty for OpenStack Block Storage -=========================================================================== diff --git a/doc/config-ref-rst/source/compute.rst b/doc/config-ref-rst/source/compute.rst index edc67c14e2..0da5e5b631 100644 --- a/doc/config-ref-rst/source/compute.rst +++ b/doc/config-ref-rst/source/compute.rst @@ -1,3 +1,7 @@ ======= Compute ======= + +.. toctree:: + + tables/conf-changes/nova.rst diff --git a/doc/config-ref-rst/source/conf.py b/doc/config-ref-rst/source/conf.py index 353f36e5c0..8af35ff02d 100644 --- a/doc/config-ref-rst/source/conf.py +++ b/doc/config-ref-rst/source/conf.py @@ -91,7 +91,8 @@ html_context = {"gitsha": gitsha, "bug_tag": bug_tag, # directories to ignore when looking for source files. exclude_patterns = ['common/cli*', 'common/nova*', 'common/log_in_dashboard.rst', - 'tables/*'] + 'tables/*.rst', + 'tables/conf-changes/ironic.rst'] # The reST default role (used for this markup: `text`) to use for all # documents. diff --git a/doc/config-ref-rst/source/data-processing-service.rst b/doc/config-ref-rst/source/data-processing-service.rst index 3030558d07..e731f1c781 100644 --- a/doc/config-ref-rst/source/data-processing-service.rst +++ b/doc/config-ref-rst/source/data-processing-service.rst @@ -1,3 +1,7 @@ ======================= Data processing service ======================= + +.. toctree:: + + tables/conf-changes/sahara.rst diff --git a/doc/config-ref-rst/source/database-service.rst b/doc/config-ref-rst/source/database-service.rst index 0319a876d2..f0c73f8119 100644 --- a/doc/config-ref-rst/source/database-service.rst +++ b/doc/config-ref-rst/source/database-service.rst @@ -1,3 +1,7 @@ ================ Database service ================ + +.. toctree:: + + tables/conf-changes/trove.rst diff --git a/doc/config-ref-rst/source/identity.rst b/doc/config-ref-rst/source/identity.rst index da04177add..2e17d24e51 100644 --- a/doc/config-ref-rst/source/identity.rst +++ b/doc/config-ref-rst/source/identity.rst @@ -1,3 +1,7 @@ ======== Identity ======== + +.. toctree:: + + tables/conf-changes/keystone.rst diff --git a/doc/config-ref-rst/source/image-service.rst b/doc/config-ref-rst/source/image-service.rst index 3a6e20a374..764a0ec257 100644 --- a/doc/config-ref-rst/source/image-service.rst +++ b/doc/config-ref-rst/source/image-service.rst @@ -1,3 +1,7 @@ ============= Image service ============= + +.. toctree:: + + tables/conf-changes/glance.rst diff --git a/doc/config-ref-rst/source/orchestration.rst b/doc/config-ref-rst/source/orchestration.rst index 36d45058b8..dce48e59e0 100644 --- a/doc/config-ref-rst/source/orchestration.rst +++ b/doc/config-ref-rst/source/orchestration.rst @@ -1,3 +1,7 @@ ============= Orchestration ============= + +.. toctree:: + + tables/conf-changes/heat.rst diff --git a/doc/config-ref-rst/source/shared-file-systems.rst b/doc/config-ref-rst/source/shared-file-systems.rst index 4d6d14aa2c..17811b2613 100644 --- a/doc/config-ref-rst/source/shared-file-systems.rst +++ b/doc/config-ref-rst/source/shared-file-systems.rst @@ -1,3 +1,7 @@ =================== Shared File Systems =================== + +.. toctree:: + + tables/conf-changes/manila.rst diff --git a/doc/config-ref-rst/source/tables/conf-changes/cinder.rst b/doc/config-ref-rst/source/tables/conf-changes/cinder.rst index 26e700b4aa..ba243eef22 100644 --- a/doc/config-ref-rst/source/tables/conf-changes/cinder.rst +++ b/doc/config-ref-rst/source/tables/conf-changes/cinder.rst @@ -21,11 +21,7 @@ New, updated, and deprecated options in Mitaka for OpenStack Block Storage * - ``[DEFAULT] cb_update_qos_group = iops, latency, graceallowed`` - ``(ListOpt) These values will be used for CloudByte storage's updateQosGroup API call.`` * - ``[DEFAULT] drbdmanage_devs_on_controller = True`` - - ``(BoolOpt) If set, the c-vol node will receive a useable - /dev/drbdX device, even if the actual data is stored on - other nodes only. - This is useful for debugging, maintenance, and to be - able to do the iSCSI export from the c-vol node.`` + - ``(BoolOpt) If set, the c-vol node will receive a useable /dev/drbdX device, even if the actual data is stored on other nodes only. This is useful for debugging, maintenance, and to be able to do the iSCSI export from the c-vol node.`` * - ``[DEFAULT] hpe3par_api_url =`` - ``(StrOpt) 3PAR WSAPI Server Url like https://<3par ip>:8080/api/v1`` * - ``[DEFAULT] hpe3par_cpg = OpenStack`` diff --git a/doc/config-ref-rst/source/telemetry.rst b/doc/config-ref-rst/source/telemetry.rst index 01eabec66c..525806858f 100644 --- a/doc/config-ref-rst/source/telemetry.rst +++ b/doc/config-ref-rst/source/telemetry.rst @@ -1,3 +1,7 @@ ========= Telemetry ========= + +.. toctree:: + + tables/conf-changes/ceilometer.rst