Remove use of gflags entirely. Use optparse.

glance/store/__init__.py

@@ -139,3 +139,26 @@ def parse_uri_tokens(parsed_uri, example_url):
     authurl = "https://%s" % '/'.join(path_parts)
 
     return user, key, authurl, container, obj
+
+
+def add_options(parser):
+    """
+    Adds any configuration options that each store might
+    have.
+
+    :param parser: An optparse.OptionParser object
+    :retval None
+    """
+    # TODO(jaypipes): Remove these imports...
+    from glance.store.http import HTTPBackend
+    from glance.store.s3 import S3Backend
+    from glance.store.swift import SwiftBackend
+    from glance.store.filesystem import FilesystemBackend
+
+    backend_classes = [FilesystemBackend,
+                       HTTPBackend,
+                       SwiftBackend,
+                       S3Backend]
+    for b in backend_classes:
+        if hasattr(b, 'add_options'):
+            b.add_options(parser)

glance/store/filesystem.py

@@ -23,17 +23,9 @@ import os
 import urlparse
 
 from glance.common import exception
-from glance.common import flags
 import glance.store
 
 
-flags.DEFINE_string('filesystem_store_datadir', '/var/lib/glance/images/',
-                    'Location to write image data. '
-                    'Default: /var/lib/glance/images/')
-
-FLAGS = flags.FLAGS
-
-
 class ChunkedFile(object):
 
     """
@@ -102,21 +94,22 @@ class FilesystemBackend(glance.store.Backend):
             raise exception.NotFound("Image file %s does not exist" % fn)
 
     @classmethod
-    def add(cls, id, data):
+    def add(cls, id, data, options):
         """
         Stores image data to disk and returns a location that the image was
         written to. By default, the backend writes the image data to a file
         `/<DATADIR>/<ID>`, where <DATADIR> is the value of
-        FLAGS.filesystem_store_datadir and <ID> is the supplied image ID.
+        options['filesystem_store_datadir'] and <ID> is the supplied image ID.
 
         :param id: The opaque image identifier
         :param data: The image data to write, as a file-like object
+        :param options: Conf mapping
 
         :retval Tuple with (location, size)
                 The location that was written, with file:// scheme prepended
                 and the size in bytes of the data written
         """
-        datadir = FLAGS.filesystem_store_datadir
+        datadir = options['filesystem_store_datadir']
 
         if not os.path.exists(datadir):
             os.makedirs(datadir)
@@ -137,3 +130,18 @@ class FilesystemBackend(glance.store.Backend):
                 f.write(buf)
 
         return ('file://%s' % filepath, bytes_written)
+
+    @classmethod
+    def add_options(cls, parser):
+        """
+        Adds specific configuration options for this store
+
+        :param parser: An optparse.OptionParser object
+        :retval None
+        """
+
+        parser.add_option('--filesystem-store-datadir', metavar="DIR",
+                          default="/var/lib/glance/images/",
+                          help="Location to write image data. This directory "
+                          "should be writeable by the user that runs the "
+                          "glance-api program. Default: %default")