openstack
/
keystone
Code Issues Proposed changes

Utilize policy.json by default (bug 1043758) 

Change-Id: I03daf10aa4f689fe323e39537c312d1e783db313
This commit is contained in:
Dolph Mathews 2012-08-30 05:58:15 -05:00
parent 84cd8ff7f3
commit 0e23490a66
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etc/keystone.conf.sample
View File

@ -14,6 +14,14 @@
# The port number which the OpenStack Compute service listens on # The port number which the OpenStack Compute service listens on
# compute_port = 8774 # compute_port = 8774
# Path to your policy definition containing identity actions
# TODO(dolph): This config method will probably be deprecated during grizzly
# policy_file = policy.json
# Rule to check if no matching policy definition is found
# FIXME(dolph): This should really be defined as [policy] default_rule
# policy_default_rule = admin_required
# === Logging Options === # === Logging Options ===
# Print debugging output # Print debugging output
# verbose = False # verbose = False

2
keystone/config.py
View File

@ -130,6 +130,8 @@ register_str('public_port', default=5000)
register_str('onready') register_str('onready')
register_str('auth_admin_prefix', default='') register_str('auth_admin_prefix', default='')
register_bool('standard-threads', default=False) register_bool('standard-threads', default=False)
register_str('policy_file', default='policy.json')
register_str('policy_default_rule', default=None)
#ssl options #ssl options
register_bool('enable', group='ssl', default=False) register_bool('enable', group='ssl', default=False)

14
keystone/policy/backends/rules.py
View File

@ -24,24 +24,10 @@ from keystone.common import policy as common_policy
from keystone.common import utils from keystone.common import utils
from keystone import config from keystone import config
from keystone import exception from keystone import exception
from keystone.openstack.common import cfg
from keystone import policy from keystone import policy
policy_opts = [
cfg.StrOpt('policy_file',
default='policy.json',
help=_('JSON file representing policy')),
cfg.StrOpt('policy_default_rule',
default='default',
help=_('Rule checked when requested rule is not found')),
]
CONF = config.CONF CONF = config.CONF
CONF.register_opts(policy_opts)
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)