From 7486e9f889c0a161fbcda2092ff48f6f2f3d4312 Mon Sep 17 00:00:00 2001 From: wangxiyuan Date: Tue, 19 Jan 2016 15:11:08 +0800 Subject: [PATCH] Remove GridFS from Glance Glance doens't support GridFS driver now. It's has been removed from glance_store[1]. [1]: https://review.openstack.org/#/c/255583/ Change-Id: I4d9a8c8f52b13b55ada99255fa0f594ecb8f75ce --- .../source/compute-images-instances.rst | 2 +- .../image-service/image_service_backends.rst | 2 -- .../source/tables/glance-gridfs.rst | 24 ------------------- .../glance.flagmappings | 2 -- .../glance.headers | 1 - 5 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 doc/config-reference/source/tables/glance-gridfs.rst diff --git a/doc/admin-guide-cloud/source/compute-images-instances.rst b/doc/admin-guide-cloud/source/compute-images-instances.rst index bfcd41eeb0..a53df1dfed 100644 --- a/doc/admin-guide-cloud/source/compute-images-instances.rst +++ b/doc/admin-guide-cloud/source/compute-images-instances.rst @@ -250,7 +250,7 @@ Sheepdog A distributed storage system for QEMU/KVM. GridFS - Stores images using MongoDB. + Stores images using MongoDB. This store driver will be removed in Mitaka. Image properties and property protection diff --git a/doc/config-reference/source/image-service/image_service_backends.rst b/doc/config-reference/source/image-service/image_service_backends.rst index c239dd2566..10b174bf9e 100644 --- a/doc/config-reference/source/image-service/image_service_backends.rst +++ b/doc/config-reference/source/image-service/image_service_backends.rst @@ -7,7 +7,6 @@ images: * OpenStack Block Storage (cinder) * A directory on a local file system -* GridFS * Ceph RBD * Amazon S3 * Sheepdog @@ -18,7 +17,6 @@ The following tables detail the options available for each. .. include:: ../tables/glance-cinder.rst .. include:: ../tables/glance-filesystem.rst -.. include:: ../tables/glance-gridfs.rst .. include:: ../tables/glance-rbd.rst .. include:: ../tables/glance-s3.rst .. include:: ../tables/glance-sheepdog.rst diff --git a/doc/config-reference/source/tables/glance-gridfs.rst b/doc/config-reference/source/tables/glance-gridfs.rst deleted file mode 100644 index f244397087..0000000000 --- a/doc/config-reference/source/tables/glance-gridfs.rst +++ /dev/null @@ -1,24 +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. - -.. _glance-gridfs: - -.. list-table:: Description of GridFS configuration options - :header-rows: 1 - :class: config-ref-table - - * - Configuration option = Default value - - Description - * - **[glance_store]** - - - * - ``mongodb_store_db`` = ``None`` - - (StrOpt) Database to use - * - ``mongodb_store_uri`` = ``None`` - - (StrOpt) Hostname or IP address of the instance to connect to, or a mongodb URI, or a list of hostnames / mongodb URIs. If host is an IPv6 literal it must be enclosed in '[' and ']' characters following the RFC2732 URL syntax (e.g. '[::1]' for localhost) diff --git a/tools/autogenerate-config-flagmappings/glance.flagmappings b/tools/autogenerate-config-flagmappings/glance.flagmappings index 6a596e27db..f7e25d8649 100644 --- a/tools/autogenerate-config-flagmappings/glance.flagmappings +++ b/tools/autogenerate-config-flagmappings/glance.flagmappings @@ -174,8 +174,6 @@ glance_store/filesystem_store_datadir filesystem glance_store/filesystem_store_datadirs filesystem glance_store/filesystem_store_file_perm filesystem glance_store/filesystem_store_metadata_file filesystem -glance_store/mongodb_store_db gridfs -glance_store/mongodb_store_uri gridfs glance_store/os_region_name common glance_store/rados_connect_timeout rbd glance_store/rbd_store_ceph_conf rbd diff --git a/tools/autogenerate-config-flagmappings/glance.headers b/tools/autogenerate-config-flagmappings/glance.headers index 00a764e2e2..ff48bc85cf 100644 --- a/tools/autogenerate-config-flagmappings/glance.headers +++ b/tools/autogenerate-config-flagmappings/glance.headers @@ -1,6 +1,5 @@ elasticsearch Elasticsearch filesystem filesystem -gridfs GridFS imagecache flagmappings matchmaker matchmaker rbd RADOS Block Devices (RBD)