Commit 6b187d7d authored by Nikos Skalkotos's avatar Nikos Skalkotos
Browse files

Merge branch 'hotfix-0.16.3'

parents a6160c57 be1eca1f
2014-10-30, v0.16.3
* pithcat: Set the default umask to 007 and fix the initialization of
the backend
2014-10-14, v0.16.2
* Fix a bug in img_properties handling introduced in v0.16.1
* Update the documentation
......
__version__ = "0.16.2"
__version__ = "0.16.3"
......@@ -96,9 +96,9 @@ parser.add_option('-s', action='store_true', dest='size', default=False,
parser.add_option('--db', dest='db', metavar='URI',
help='SQLAlchemy URI of the database [DANGEROUS: Do not use,'
'see NOTE below]', default=None)
parser.add_option('--umask', dest='umask', metavar='UMASK', type='int',
default=None,
help='change the process\' file mode mask to UMASK')
parser.add_option(
'--umask', dest='umask', metavar='UMASK', type='int', default=0o7,
help='change the process\' file mode mask to UMASK (default: 007)')
LocationURL = namedtuple('LocationURL', ['account', 'container', 'object'])
HashmapURL = namedtuple('HashmapURL', ['hash', 'size'])
......@@ -275,12 +275,12 @@ def main():
block_params['blockpool'] = rados_blocks
block_params['mappool'] = rados_maps
backend = ModularBackend(None,
db_uri if type(url) is LocationURL else None,
None,
data_path, block_params=block_params,
backend_storage=backend_storage,
rados_ceph_conf=rados_ceph_conf)
backend_kwargs = {
"block_path": data_path,
"block_params": block_params,
"backend_storage": backend_storage,
"rados_ceph_conf": rados_ceph_conf
}
elif mb_version >= MB_ARCHIPELAGO_VER:
if not options.archipconf and 'PITHCAT_ARCHIPELAGO_CONF' not \
......@@ -296,15 +296,16 @@ def main():
archipelago_conf_file = environ['PITHCAT_ARCHIPELAGO_CONF'] if not \
options.archipconf else options.archipconf
backend = ModularBackend(None,
db_uri if type(url) is LocationURL else None,
None,
archipelago_conf_file=archipelago_conf_file)
backend_kwargs = {"archipelago_conf_file": archipelago_conf_file}
else:
backend = ModularBackend(None,
db_uri if type(url) is LocationURL else None,
None,
data_path)
backend_kwargs = {"block_path": data_path}
if type(url) is LocationURL:
# Used only for 'pithos://' URLs
backend_kwargs["db_connection"] = db_uri
# Initialize Pithos Backend
backend = ModularBackend(**backend_kwargs)
try:
if options.size:
......
m4_define([devflow_version], [0.16.2])
m4_define([devflow_version], [0.16.3])
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment