Merge lp:~rconradharris/glance/lp711385 into lp:~glance-coresec/glance/cactus-trunk

[Rick Harris]

Adds back --sql-connection option

[Jay Pipes (jaypipes)]

Hi!

Looks good, but found a small typo:

40 + glance.registry.db.add_option(parser)

Should be add_options(), not add_option(). :)

-jay

review: Needs Fixing

[lp:~rconradharris/glance/lp711385]

61. By Rick Harris on 2011-02-01

Typo add_option -> add_options

[Rick Harris (rconradharris)]

Doh, good catch. Pushed fix.

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[Jay Pipes (jaypipes)]

coolio.

review: Approve

=== modified file 'bin/glance-combined'
--- bin/glance-combined	2011-01-31 18:46:04 +0000
+++ bin/glance-combined	2011-02-01 19:55:53 +0000
@@ -35,6 +35,7 @@
 from glance import version
 from glance.common import config
 from glance.common import server
+import glance.registry.db
 import glance.store
 
 
@@ -98,6 +99,7 @@
                       "virtual machine images to. Choices: ('%s') "
                       "Default: %%default" % "','".join(DEFAULT_STORE_CHOICES))
     glance.store.add_options(parser)
+    glance.registry.db.add_options(parser)
 
 
 def main(_args):

=== modified file 'bin/glance-registry'
--- bin/glance-registry	2011-01-31 18:21:30 +0000
+++ bin/glance-registry	2011-02-01 19:55:53 +0000
@@ -30,6 +30,7 @@
 
 sys.path.append(ROOT_DIR)
 
+import glance.registry.db
 from glance import version
 from glance.common import config
 from glance.common import server
@@ -75,10 +76,7 @@
                       help="uid under which to run. Default: %default")
     parser.add_option("--gid", type=int, default=os.getgid(),
                       help="gid under which to run. Default: %default")
-    parser.add_option('--sql-connection', metavar="CONNECTION",
-                      default='sqlite:///glance.sqlite',
-                      help="A valid SQLAlchemy connection string for the "
-                           "registry database. Default: %default")
+    glance.registry.db.add_options(parser)
 
 
 def main(_args):

=== modified file 'glance/registry/db/__init__.py'
--- glance/registry/db/__init__.py	2011-01-31 19:39:39 +0000
+++ glance/registry/db/__init__.py	2011-02-01 19:55:53 +0000
@@ -16,3 +16,16 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
+
+
+def add_options(parser):
+    """
+    Adds any configuration options that the db layer might have.
+
+    :param parser: An optparse.OptionParser object
+    :retval None
+    """
+    parser.add_option('--sql-connection', metavar="CONNECTION",
+                      default='sqlite:///glance.sqlite',
+                      help="A valid SQLAlchemy connection string for the "
+                           "registry database. Default: %default")

=== modified file 'run_tests.sh'
--- run_tests.sh	2011-01-27 04:19:13 +0000
+++ run_tests.sh	2011-02-01 19:55:53 +0000
@@ -71,4 +71,12 @@
   fi
 fi
 
-run_tests && pep8 --repeat --show-pep8 --show-source bin/* glance setup.py run_tests.py || exit 1
+# FIXME(sirp): bzr version-info is not currently pep-8. This was fixed with
+# lp701898 [1], however, until that version of bzr becomes standard, I'm just
+# excluding the vcsversion.py file
+#
+# [1] https://bugs.launchpad.net/bzr/+bug/701898
+#
+PEP8_EXCLUDE=vcsversion.py
+PEP8_OPTIONS="--exclude=$PEP8_EXCLUDE --repeat --show-pep8 --show-source"
+run_tests && pep8 $PEP8_OPTIONS bin/* glance setup.py run_tests.py || exit 1