From 74a85b0f2954f96eeda876ec8fc8f43017aa8a82 Mon Sep 17 00:00:00 2001
From: Chris Dent <chdent@redhat.com>
Date: Wed, 22 Apr 2015 18:02:39 +0000
Subject: [PATCH] Set policy_file in the oslo_policy group

policy_file in DEFAULT is deprecated

Change-Id: I6698a810d5e6c395a18aed8066e61f8c4bae2408
---
 lib/ceilometer     | 2 +-
 lib/ironic         | 2 +-
 lib/neutron-legacy | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/ceilometer b/lib/ceilometer
index 3a4a4fb167..9abdbfe286 100644
--- a/lib/ceilometer
+++ b/lib/ceilometer
@@ -195,7 +195,7 @@ function configure_ceilometer {
 
     # Install the policy file for the API server
     cp $CEILOMETER_DIR/etc/ceilometer/policy.json $CEILOMETER_CONF_DIR
-    iniset $CEILOMETER_CONF DEFAULT policy_file $CEILOMETER_CONF_DIR/policy.json
+    iniset $CEILOMETER_CONF oslo_policy policy_file $CEILOMETER_CONF_DIR/policy.json
 
     cp $CEILOMETER_DIR/etc/ceilometer/pipeline.yaml $CEILOMETER_CONF_DIR
     cp $CEILOMETER_DIR/etc/ceilometer/event_pipeline.yaml $CEILOMETER_CONF_DIR
diff --git a/lib/ironic b/lib/ironic
index 4ac0100410..4a37f0aafa 100644
--- a/lib/ironic
+++ b/lib/ironic
@@ -296,7 +296,7 @@ function configure_ironic {
 # API specific configuration.
 function configure_ironic_api {
     iniset $IRONIC_CONF_FILE DEFAULT auth_strategy keystone
-    iniset $IRONIC_CONF_FILE DEFAULT policy_file $IRONIC_POLICY_JSON
+    iniset $IRONIC_CONF_FILE oslo_policy policy_file $IRONIC_POLICY_JSON
 
     # TODO(Yuki Nishiwaki): This is a temporary work-around until Ironic is fixed(bug#1422632).
     # These codes need to be changed to use the function of configure_auth_token_middleware
diff --git a/lib/neutron-legacy b/lib/neutron-legacy
index 3072d0a0ed..ac1cd0ffc2 100644
--- a/lib/neutron-legacy
+++ b/lib/neutron-legacy
@@ -1081,7 +1081,7 @@ function _configure_neutron_service {
 
     iniset $NEUTRON_CONF DEFAULT verbose True
     iniset $NEUTRON_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL
-    iniset $NEUTRON_CONF DEFAULT policy_file $Q_POLICY_FILE
+    iniset $NEUTRON_CONF oslo_policy policy_file $Q_POLICY_FILE
     iniset $NEUTRON_CONF DEFAULT allow_overlapping_ips $Q_ALLOW_OVERLAPPING_IP
 
     iniset $NEUTRON_CONF DEFAULT auth_strategy $Q_AUTH_STRATEGY