@@ -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

@@ -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

@@ -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