stackforge-attic/murano-repository
Code Issues Proposed changes

Merge "Set keystone signing directory in config"

Browse Source
This commit is contained in:
Jenkins 2013-11-25 13:57:43 +00:00 committed by Gerrit Code Review
commit 46b4d85810
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
muranorepository/cmd/run.py
View File

@ -67,7 +67,8 @@ def main():
'auth_protocol': cfg.CONF.keystone.auth_protocol, 'auth_protocol': cfg.CONF.keystone.auth_protocol,
'admin_user': cfg.CONF.keystone.admin_user, 'admin_user': cfg.CONF.keystone.admin_user,
'admin_password': cfg.CONF.keystone.admin_password, 'admin_password': cfg.CONF.keystone.admin_password,
'admin_tenant_name': cfg.CONF.keystone.admin_tenant_name 'admin_tenant_name': cfg.CONF.keystone.admin_tenant_name,
'signing_dir': cfg.CONF.keystone.signing_dir
}) })
if not os.path.isabs(config.CONF.manifests): if not os.path.isabs(config.CONF.manifests):
config.CONF.manifests = os.path.join(possible_topdir, config.CONF.manifests = os.path.join(possible_topdir,

7
muranorepository/config.py
View File

@ -18,7 +18,8 @@ from muranorepository.consts import *
server_opts = [ server_opts = [
cfg.StrOpt('host', default='127.0.0.1'), cfg.StrOpt('host', default='127.0.0.1'),
cfg.IntOpt('port', default=5000)] cfg.IntOpt('port', default=5000)
]
cache_opt = cfg.StrOpt('cache_dir') cache_opt = cfg.StrOpt('cache_dir')
@ -28,7 +29,9 @@ keystone_opts = [
cfg.StrOpt('auth_protocol', default='http'), cfg.StrOpt('auth_protocol', default='http'),
cfg.StrOpt('admin_user', default='admin'), cfg.StrOpt('admin_user', default='admin'),
cfg.StrOpt('admin_password', default=None), cfg.StrOpt('admin_password', default=None),
cfg.StrOpt('admin_tenant_name', default='admin')] cfg.StrOpt('admin_tenant_name', default='admin'),
cfg.StrOpt('signing_dir', default='/tmp/keystone-muranorepository')
]
type_dirs_opts = [cfg.StrOpt(x) for x in DATA_TYPES] type_dirs_opts = [cfg.StrOpt(x) for x in DATA_TYPES]