Commit Graph

19 Commits

Author SHA1 Message Date
Mark McLoughlin
9d9d225419 Port remaining code to global conf object
Implements blueprint cfg-global-object

This iteration fixes up the remaining places where we're passing a
conf object around.

Change-Id: I3b627d093a6b7afeee129ab66b377a3b0af5439b
2012-06-08 17:36:25 +01:00
Brian Waldon
a68eb24431 Create 'simple' db driver
Move the core of glance.tests.unit.utils:FakeDB to glance.db.simple.
This 'simple' driver is an alternative to the traditional sqlalchemy
driver. Additionally, the sqlalchemy driver has been moved from
glance.db to glance.db.sqlalchemy. The simple db driver is only
available to be used by tests for now.

Related to bp refactor-db-layer

Change-Id: I9d33a433c0c03e53fb5a3491076086427ae694b3
2012-06-07 09:20:50 -07:00
Mark McLoughlin
1038a19a32 Add cfg's new global CONF object
Implements blueprint cfg-global-object

Begin adopting cfg's global CONF object pattern rather than passing
a conf object around everywhere.

This iterations does just enough to have each of the glance programs
initialize CONF and get the unit tests working.

Change-Id: Ia34959b3ba52cbe933d5d347f31319271b2e14f9
2012-06-05 21:50:55 +01:00
Brian Waldon
dfd9e207f2 Move glance.registry.db to glance.db
Related to bp refactor-db-layer

Change-Id: Ia7c5aea29eef8068a9b67ac5fd051b45a38a20de
2012-06-04 09:29:42 -07:00
Eoghan Glynn
71c98ae887 Support DB auto-create suppression.
Adds a new boolean config option, db_auto_create, to allow the
DB auto-creation be suppressed on demand. This defaults to True
for now to maintain the pre-existing behaviour, but should be
changed to False before the Folsom release.

The 'glance-manage db_sync' command will now create the image*
tables if the DB did not previously exist. The db_auto_create
flag is irrelevant in that case.

The @glance.tests.function.runs_sql annotation is now obsolete
as the glance-api/registry services launched by functional tests
must now all run against an on-disk sqlite instance (as opposed
to in-memory, as this makes no sense when the DB tables are
created in advance).

Change-Id: I05fc6b3ca7691dfaf00bc75a0743c921c93b9694
2012-05-19 08:35:04 +01:00
Zhongyue Luo
49a0f962f6 Backslash continuation removal (Glance folsom-1)
Fixes bug #1000636

Removes backslash continuations (except sqlalchemy and mox related code)

Change-Id: I08e6db28f157d67be9fc11ec02cc0844c006a6df
2012-05-17 22:56:09 +08:00
Brian Waldon
8b23d4faaf Integrate openstack-common using update.py
* Update all cfg and setup imports to point to new location
* Fixes bug 987968

Change-Id: If2fbf126e0b241e80ee59fa4e43bb5af6eb879a8
2012-04-30 14:01:13 -07:00
Mark McLoughlin
da66de0676 Allow specifying the current version in 'glance-manage version_control'
Fixes bug #966242

The version_control command is a bit useless since you can't actually
specify what version to  use and it defaults to version=0.

Allow the user to specify a version:

  $> glance-manage version_control 9 # set the diablo version

and default to the latest version if none is specified.

Also, allow db_sync to be supplied a version for the case where we're
upgrading an unversioned DB.

Finally, re-work the argument handling in glance-manage to more easily
handle optional args.

The tests are extended to test using db_sync for upgrades and to test
placing an existing database under version control.

Change-Id: I231dc710554198bfd1fdcb82c3c3768963f64bd8
2012-03-28 07:16:22 +01:00
Mark McLoughlin
57c4e9b6c6 Convert glance to use the new cfg module
The changes here are substantial and widespread, but in summary:

  - We use cfg to parse the CLI and config files, rather than optparse
    and PasteDeploy

  - A schema is defined for all configuration options close to the code
    which uses the option

  - 2 ConfigOpts sub-classes are added to config.py basically just
    defining how to find config files; this means we can now use e.g.
    glance.conf for base config values which glance-api.conf can
    override

  - load_paste_app() is changed to load the paste app from the last
    config file in the stack and pass the app the ConfigOpts instance

  - The generic app and filter factories in wsgi.py are modified to
    pass a ConfigOpts instance to the apps and filters

  - A ConfigOpts subclass is added for the unit tests which writes out
    config values to a temporary config file and uses cfg to parse that

I've tried to keep the switch as unobtrusive as possible leaving further
cleanups for later e.g.

  - Moving PasteDeploy config out of the config files - I think it would
    be good to aim for having users modify the PasteDeploy config files
    only in fairly rare circumstances. To achieve this, we might define
    a number of common pipelines in the PasteDeploy config and allow
    the user to choose between those pipelines in the glance config.

  - We should add help strings to all the opts, even just for the sake
    of documenting them

  - We should move a bunch of the options into groups - e.g. all the
    rabbit options

  - We no longer rely on config files for default values, so the default
    config files could contain nothing but comments - i.e. explaining
    each option and showing what the default for it is - making it
    obvious where a user has explicitly set a value

There are a couple of behavioural changes which I don't think are
signifcant but are worth mentioning:

  - We used to support passing a config file as a positional argument
    but don't anymore; AFAICT, it was only used by glance-manage when
    launching servers and I've changed that to pass --config-file

  - log_opt_values() doesn't log unknown opts, so won't log any values
    for opts which get registered at runtime later

Change-Id: Iafa998a2a8d860f1ad57e2cd2afee69686ed58ba
2011-12-08 22:32:52 +00:00
Mark McLoughlin
1f979ca757 Allow glance-cache-* find their config files
By default, glance-cache-cleaner looks for glance-cleaner.conf but
its actual config file is glance-cache.conf.

Change the find_config_file() argument to conf_name and make it an
optional argument to load_paste_app(). This allows us to specify
a different config file for the glance apps than their app name.

find_config_file() is also changed to raise an exception if no
config file is found.

Change-Id: Iec71218f5b2f0a7f057ea02f4549bd743892cc65
2011-11-09 22:51:20 +00:00
Brian Waldon
45c7280783 Correcting exception handling in glance-manage
Fixes bug 884432

Change-Id: I76c0a97e502dd05b4c56c84fa640d1f0e0cd48ae
2011-11-01 10:16:05 -04:00
Justin Shepherd
8a33e24311 Addresses glance/+spec/i18n
Added gettext.install to glance endpoints, setup.py, and run_tests.py. Wrapped all exceptions in common/exception.py with gettext.

Included fix for bug lp:823676.

Change-Id: Ied4381e1676227afea857acd01f4754e6a181106
2011-08-10 09:09:56 -05:00
jaypipes@gmail.com
96517452e5 Fix config test fixtures and pep8 error in bin/glance-manage 2011-04-07 14:54:07 -04:00
jaypipes@gmail.com
4eaf065305 Updates glance-manage to use configuration files as well
as command line options.

Completes documentation on configuring Glance's servers
and CLI tools.
2011-04-04 13:00:26 -04:00
jaypipes@gmail.com
bdc4b1c8e6 Remove glance-combined (use glance-control all start). Fix glance-manage to call the setup_logging() and add_logging_options() methods according to the way they are called in glance-api and glance-registry 2011-03-17 10:39:50 -04:00
jaypipes@gmail.com
bb5f1229ef Use Nova's path trick in all bins... 2011-02-21 17:11:27 -05:00
Rick Harris
a436b433ca glance-manage uses common options 2011-02-02 12:47:08 -06:00
Rick Harris
15d8f90cb9 Adding db_sync to mirror nova 2011-02-02 07:07:41 +00:00
Rick Harris
9c5290bcb5 Adding migration management commands 2011-02-02 01:43:16 +00:00