lp:~rconradharris/glance/bug716652
- Get this branch:
- bzr branch lp:~rconradharris/glance/bug716652
Branch merges
- Jay Pipes (community): Approve
-
Diff: 71 lines (+38/-1)3 files modifiedetc/glance.conf.sample (+9/-0)
glance/common/config.py (+21/-0)
glance/registry/db/api.py (+8/-1)
Branch information
Recent revisions
- 69. By Jay Pipes
-
Removes lockfile and custom python-daemon server initialization
in favour of paste.deploy. - 65. By Jay Pipes
-
Adds facilities for configuring Glance's servers via
configuration files.glance-api, glance-registry, and glance-combined now process
a set of configuration files in order, with options read from
later files overriding values in earlier files:/etc/glance.cnf
/etc/glance/ glance. conf
~/glance.cnf
~/.glance/ glance. cnf
./glance.cnfThe new glance.
common. config. get_config_ file_options( ) function
processes these config files into a mapping of key/value
option pairs. This mapping can now be passed to the
glance.common. config. parse_options( ) function as default values Adds a sample glance.cnf to the etc/ directory
- 64. By Rick Harris
-
Adds sqlalchemy migrations.
Also adds a glance-manage utility for managing migrations.
Potentially glance-manage (and glance-upload) could be merged into glance-admin when that lands.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:~glance-coresec/glance/cactus-trunk