Move policy options to the oslo_policy group in the config

Having the policy-related options in the DEFAULT section in the config
has been deprecated in favor of having an oslo_policy group. This CR
effectively changes that in the configuration we give as an example.

Change-Id: If5433f6fd5b295e5e758a75ea2eac3892e78e681
This commit is contained in:
Juan Antonio Osorio Robles 2015-05-19 21:02:28 +03:00
parent 32380f1fd7
commit afde0a52b0

View File

@ -132,14 +132,6 @@ scrub_time = 43200
# Make sure this is also set in glance-scrubber.conf
scrubber_datadir = /var/lib/barbican/scrubber
# ======== OpenStack policy integration
# JSON file representing policy (string value)
policy_file=/etc/barbican/policy.json
# Rule checked when requested rule is not found (string value)
policy_default_rule=default
# ================= Queue Options - oslo.messaging ==========================
# Rabbit and HA configuration:
@ -158,6 +150,17 @@ rabbit_hosts=localhost:5672
# DO NOT USE THIS, due to '# FIXME(markmc): support multiple hosts' in oslo/messaging/_drivers/amqpdriver.py
# transport_url = rabbit://guest@localhost:5672/
# ======== OpenStack policy - oslo_policy ===============
[oslo_policy]
# ======== OpenStack policy integration
# JSON file representing policy (string value)
policy_file=/etc/barbican/policy.json
# Rule checked when requested rule is not found (string value)
policy_default_rule=default
# ================= Queue Options - Application ==========================