From ab799d640ed7d2f155473a1f9cd99b220a83d988 Mon Sep 17 00:00:00 2001 From: KATO Tomoyuki Date: Mon, 1 Aug 2016 20:20:38 +0900 Subject: [PATCH] [config-ref] normalize file naming by service name Change-Id: I216ca2daa3410ffc24daba6d7b5e528e114c4008 --- .../{database-service.rst => database.rst} | 6 ++--- .../database.rst | 0 .../{database-service => database}/logs.rst | 0 .../{database-service => database}/rpc.rst | 0 .../source/{image-service.rst => image.rst} | 10 ++++----- .../source/{image-service => image}/api.rst | 0 .../{image-service => image}/backends.rst | 0 .../glance-api-paste.ini.rst | 0 .../glance-api.conf.rst | 0 .../glance-cache.conf.rst | 0 .../glance-manage.conf.rst | 0 .../glance-registry-paste.ini.rst | 0 .../glance-registry.conf.rst | 0 .../glance-scrubber.conf.rst | 0 .../glance-swift.conf.rst | 0 .../source/{image-service => image}/logs.rst | 0 .../ovf-metadata.json.rst | 0 .../{image-service => image}/policy.json.rst | 0 .../property-protections-policies.conf.rst | 0 .../property-protections-roles.conf.rst | 0 .../source/{image-service => image}/rpc.rst | 0 .../sample-configuration-files.rst | 0 doc/config-reference/source/index.rst | 6 ++--- .../source/{messaging.rst => message.rst} | 22 +++++++++---------- .../source/{messaging => message}/logs.rst | 0 .../{messaging => message}/zaqar-api.rst | 0 .../zaqar-authentication.rst | 0 .../{messaging => message}/zaqar-cache.rst | 0 .../{messaging => message}/zaqar-conf.rst | 0 .../{messaging => message}/zaqar-drivers.rst | 0 .../{messaging => message}/zaqar-logging.rst | 0 .../zaqar-notifications.rst | 0 .../{messaging => message}/zaqar-pooling.rst | 0 .../zaqar-storage-drivers.rst | 0 .../zaqar-transport-drivers.rst | 0 35 files changed, 22 insertions(+), 22 deletions(-) rename doc/config-reference/source/{database-service.rst => database.rst} (92%) rename doc/config-reference/source/{database-service => database}/database.rst (100%) rename doc/config-reference/source/{database-service => database}/logs.rst (100%) rename doc/config-reference/source/{database-service => database}/rpc.rst (100%) rename doc/config-reference/source/{image-service.rst => image.rst} (88%) rename doc/config-reference/source/{image-service => image}/api.rst (100%) rename doc/config-reference/source/{image-service => image}/backends.rst (100%) rename doc/config-reference/source/{image-service => image}/glance-api-paste.ini.rst (100%) rename doc/config-reference/source/{image-service => image}/glance-api.conf.rst (100%) rename doc/config-reference/source/{image-service => image}/glance-cache.conf.rst (100%) rename doc/config-reference/source/{image-service => image}/glance-manage.conf.rst (100%) rename doc/config-reference/source/{image-service => image}/glance-registry-paste.ini.rst (100%) rename doc/config-reference/source/{image-service => image}/glance-registry.conf.rst (100%) rename doc/config-reference/source/{image-service => image}/glance-scrubber.conf.rst (100%) rename doc/config-reference/source/{image-service => image}/glance-swift.conf.rst (100%) rename doc/config-reference/source/{image-service => image}/logs.rst (100%) rename doc/config-reference/source/{image-service => image}/ovf-metadata.json.rst (100%) rename doc/config-reference/source/{image-service => image}/policy.json.rst (100%) rename doc/config-reference/source/{image-service => image}/property-protections-policies.conf.rst (100%) rename doc/config-reference/source/{image-service => image}/property-protections-roles.conf.rst (100%) rename doc/config-reference/source/{image-service => image}/rpc.rst (100%) rename doc/config-reference/source/{image-service => image}/sample-configuration-files.rst (100%) rename doc/config-reference/source/{messaging.rst => message.rst} (90%) rename doc/config-reference/source/{messaging => message}/logs.rst (100%) rename doc/config-reference/source/{messaging => message}/zaqar-api.rst (100%) rename doc/config-reference/source/{messaging => message}/zaqar-authentication.rst (100%) rename doc/config-reference/source/{messaging => message}/zaqar-cache.rst (100%) rename doc/config-reference/source/{messaging => message}/zaqar-conf.rst (100%) rename doc/config-reference/source/{messaging => message}/zaqar-drivers.rst (100%) rename doc/config-reference/source/{messaging => message}/zaqar-logging.rst (100%) rename doc/config-reference/source/{messaging => message}/zaqar-notifications.rst (100%) rename doc/config-reference/source/{messaging => message}/zaqar-pooling.rst (100%) rename doc/config-reference/source/{messaging => message}/zaqar-storage-drivers.rst (100%) rename doc/config-reference/source/{messaging => message}/zaqar-transport-drivers.rst (100%) diff --git a/doc/config-reference/source/database-service.rst b/doc/config-reference/source/database.rst similarity index 92% rename from doc/config-reference/source/database-service.rst rename to doc/config-reference/source/database.rst index 6410581248..d784233ecc 100644 --- a/doc/config-reference/source/database-service.rst +++ b/doc/config-reference/source/database.rst @@ -4,9 +4,9 @@ Database service .. toctree:: - database-service/database.rst - database-service/rpc.rst - database-service/logs.rst + database/database.rst + database/rpc.rst + database/logs.rst tables/conf-changes/trove.rst The Database service provides a scalable and reliable Cloud diff --git a/doc/config-reference/source/database-service/database.rst b/doc/config-reference/source/database/database.rst similarity index 100% rename from doc/config-reference/source/database-service/database.rst rename to doc/config-reference/source/database/database.rst diff --git a/doc/config-reference/source/database-service/logs.rst b/doc/config-reference/source/database/logs.rst similarity index 100% rename from doc/config-reference/source/database-service/logs.rst rename to doc/config-reference/source/database/logs.rst diff --git a/doc/config-reference/source/database-service/rpc.rst b/doc/config-reference/source/database/rpc.rst similarity index 100% rename from doc/config-reference/source/database-service/rpc.rst rename to doc/config-reference/source/database/rpc.rst diff --git a/doc/config-reference/source/image-service.rst b/doc/config-reference/source/image.rst similarity index 88% rename from doc/config-reference/source/image-service.rst rename to doc/config-reference/source/image.rst index e7abceea4c..4151ae42ac 100644 --- a/doc/config-reference/source/image-service.rst +++ b/doc/config-reference/source/image.rst @@ -4,11 +4,11 @@ Image service .. toctree:: - image-service/api.rst - image-service/rpc.rst - image-service/backends.rst - image-service/logs.rst - image-service/sample-configuration-files.rst + image/api.rst + image/rpc.rst + image/backends.rst + image/logs.rst + image/sample-configuration-files.rst tables/conf-changes/glance.rst Compute relies on an external image service to store virtual machine images and diff --git a/doc/config-reference/source/image-service/api.rst b/doc/config-reference/source/image/api.rst similarity index 100% rename from doc/config-reference/source/image-service/api.rst rename to doc/config-reference/source/image/api.rst diff --git a/doc/config-reference/source/image-service/backends.rst b/doc/config-reference/source/image/backends.rst similarity index 100% rename from doc/config-reference/source/image-service/backends.rst rename to doc/config-reference/source/image/backends.rst diff --git a/doc/config-reference/source/image-service/glance-api-paste.ini.rst b/doc/config-reference/source/image/glance-api-paste.ini.rst similarity index 100% rename from doc/config-reference/source/image-service/glance-api-paste.ini.rst rename to doc/config-reference/source/image/glance-api-paste.ini.rst diff --git a/doc/config-reference/source/image-service/glance-api.conf.rst b/doc/config-reference/source/image/glance-api.conf.rst similarity index 100% rename from doc/config-reference/source/image-service/glance-api.conf.rst rename to doc/config-reference/source/image/glance-api.conf.rst diff --git a/doc/config-reference/source/image-service/glance-cache.conf.rst b/doc/config-reference/source/image/glance-cache.conf.rst similarity index 100% rename from doc/config-reference/source/image-service/glance-cache.conf.rst rename to doc/config-reference/source/image/glance-cache.conf.rst diff --git a/doc/config-reference/source/image-service/glance-manage.conf.rst b/doc/config-reference/source/image/glance-manage.conf.rst similarity index 100% rename from doc/config-reference/source/image-service/glance-manage.conf.rst rename to doc/config-reference/source/image/glance-manage.conf.rst diff --git a/doc/config-reference/source/image-service/glance-registry-paste.ini.rst b/doc/config-reference/source/image/glance-registry-paste.ini.rst similarity index 100% rename from doc/config-reference/source/image-service/glance-registry-paste.ini.rst rename to doc/config-reference/source/image/glance-registry-paste.ini.rst diff --git a/doc/config-reference/source/image-service/glance-registry.conf.rst b/doc/config-reference/source/image/glance-registry.conf.rst similarity index 100% rename from doc/config-reference/source/image-service/glance-registry.conf.rst rename to doc/config-reference/source/image/glance-registry.conf.rst diff --git a/doc/config-reference/source/image-service/glance-scrubber.conf.rst b/doc/config-reference/source/image/glance-scrubber.conf.rst similarity index 100% rename from doc/config-reference/source/image-service/glance-scrubber.conf.rst rename to doc/config-reference/source/image/glance-scrubber.conf.rst diff --git a/doc/config-reference/source/image-service/glance-swift.conf.rst b/doc/config-reference/source/image/glance-swift.conf.rst similarity index 100% rename from doc/config-reference/source/image-service/glance-swift.conf.rst rename to doc/config-reference/source/image/glance-swift.conf.rst diff --git a/doc/config-reference/source/image-service/logs.rst b/doc/config-reference/source/image/logs.rst similarity index 100% rename from doc/config-reference/source/image-service/logs.rst rename to doc/config-reference/source/image/logs.rst diff --git a/doc/config-reference/source/image-service/ovf-metadata.json.rst b/doc/config-reference/source/image/ovf-metadata.json.rst similarity index 100% rename from doc/config-reference/source/image-service/ovf-metadata.json.rst rename to doc/config-reference/source/image/ovf-metadata.json.rst diff --git a/doc/config-reference/source/image-service/policy.json.rst b/doc/config-reference/source/image/policy.json.rst similarity index 100% rename from doc/config-reference/source/image-service/policy.json.rst rename to doc/config-reference/source/image/policy.json.rst diff --git a/doc/config-reference/source/image-service/property-protections-policies.conf.rst b/doc/config-reference/source/image/property-protections-policies.conf.rst similarity index 100% rename from doc/config-reference/source/image-service/property-protections-policies.conf.rst rename to doc/config-reference/source/image/property-protections-policies.conf.rst diff --git a/doc/config-reference/source/image-service/property-protections-roles.conf.rst b/doc/config-reference/source/image/property-protections-roles.conf.rst similarity index 100% rename from doc/config-reference/source/image-service/property-protections-roles.conf.rst rename to doc/config-reference/source/image/property-protections-roles.conf.rst diff --git a/doc/config-reference/source/image-service/rpc.rst b/doc/config-reference/source/image/rpc.rst similarity index 100% rename from doc/config-reference/source/image-service/rpc.rst rename to doc/config-reference/source/image/rpc.rst diff --git a/doc/config-reference/source/image-service/sample-configuration-files.rst b/doc/config-reference/source/image/sample-configuration-files.rst similarity index 100% rename from doc/config-reference/source/image-service/sample-configuration-files.rst rename to doc/config-reference/source/image/sample-configuration-files.rst diff --git a/doc/config-reference/source/index.rst b/doc/config-reference/source/index.rst index ee440dd184..cdbe58d1b3 100644 --- a/doc/config-reference/source/index.rst +++ b/doc/config-reference/source/index.rst @@ -26,10 +26,10 @@ Contents compute.rst dashboard.rst data-processing-service.rst - database-service.rst + database.rst identity.rst - image-service.rst - messaging.rst + image.rst + message.rst networking.rst object-storage.rst orchestration.rst diff --git a/doc/config-reference/source/messaging.rst b/doc/config-reference/source/message.rst similarity index 90% rename from doc/config-reference/source/messaging.rst rename to doc/config-reference/source/message.rst index fb713c5f7b..b818af845f 100644 --- a/doc/config-reference/source/messaging.rst +++ b/doc/config-reference/source/message.rst @@ -5,17 +5,17 @@ Message service .. toctree:: :maxdepth: 1 - messaging/zaqar-conf.rst - messaging/zaqar-api.rst - messaging/zaqar-logging.rst - messaging/zaqar-drivers.rst - messaging/zaqar-storage-drivers.rst - messaging/zaqar-transport-drivers.rst - messaging/zaqar-notifications.rst - messaging/zaqar-authentication.rst - messaging/zaqar-pooling.rst - messaging/logs.rst - messaging/zaqar-cache.rst + message/zaqar-conf.rst + message/zaqar-api.rst + message/zaqar-logging.rst + message/zaqar-drivers.rst + message/zaqar-storage-drivers.rst + message/zaqar-transport-drivers.rst + message/zaqar-notifications.rst + message/zaqar-authentication.rst + message/zaqar-pooling.rst + message/logs.rst + message/zaqar-cache.rst The Message service is multi-tenant, fast, reliable, and scalable. It allows developers to share data between distributed application components performing diff --git a/doc/config-reference/source/messaging/logs.rst b/doc/config-reference/source/message/logs.rst similarity index 100% rename from doc/config-reference/source/messaging/logs.rst rename to doc/config-reference/source/message/logs.rst diff --git a/doc/config-reference/source/messaging/zaqar-api.rst b/doc/config-reference/source/message/zaqar-api.rst similarity index 100% rename from doc/config-reference/source/messaging/zaqar-api.rst rename to doc/config-reference/source/message/zaqar-api.rst diff --git a/doc/config-reference/source/messaging/zaqar-authentication.rst b/doc/config-reference/source/message/zaqar-authentication.rst similarity index 100% rename from doc/config-reference/source/messaging/zaqar-authentication.rst rename to doc/config-reference/source/message/zaqar-authentication.rst diff --git a/doc/config-reference/source/messaging/zaqar-cache.rst b/doc/config-reference/source/message/zaqar-cache.rst similarity index 100% rename from doc/config-reference/source/messaging/zaqar-cache.rst rename to doc/config-reference/source/message/zaqar-cache.rst diff --git a/doc/config-reference/source/messaging/zaqar-conf.rst b/doc/config-reference/source/message/zaqar-conf.rst similarity index 100% rename from doc/config-reference/source/messaging/zaqar-conf.rst rename to doc/config-reference/source/message/zaqar-conf.rst diff --git a/doc/config-reference/source/messaging/zaqar-drivers.rst b/doc/config-reference/source/message/zaqar-drivers.rst similarity index 100% rename from doc/config-reference/source/messaging/zaqar-drivers.rst rename to doc/config-reference/source/message/zaqar-drivers.rst diff --git a/doc/config-reference/source/messaging/zaqar-logging.rst b/doc/config-reference/source/message/zaqar-logging.rst similarity index 100% rename from doc/config-reference/source/messaging/zaqar-logging.rst rename to doc/config-reference/source/message/zaqar-logging.rst diff --git a/doc/config-reference/source/messaging/zaqar-notifications.rst b/doc/config-reference/source/message/zaqar-notifications.rst similarity index 100% rename from doc/config-reference/source/messaging/zaqar-notifications.rst rename to doc/config-reference/source/message/zaqar-notifications.rst diff --git a/doc/config-reference/source/messaging/zaqar-pooling.rst b/doc/config-reference/source/message/zaqar-pooling.rst similarity index 100% rename from doc/config-reference/source/messaging/zaqar-pooling.rst rename to doc/config-reference/source/message/zaqar-pooling.rst diff --git a/doc/config-reference/source/messaging/zaqar-storage-drivers.rst b/doc/config-reference/source/message/zaqar-storage-drivers.rst similarity index 100% rename from doc/config-reference/source/messaging/zaqar-storage-drivers.rst rename to doc/config-reference/source/message/zaqar-storage-drivers.rst diff --git a/doc/config-reference/source/messaging/zaqar-transport-drivers.rst b/doc/config-reference/source/message/zaqar-transport-drivers.rst similarity index 100% rename from doc/config-reference/source/messaging/zaqar-transport-drivers.rst rename to doc/config-reference/source/message/zaqar-transport-drivers.rst