Set policy_file in the oslo_policy group
policy_file in DEFAULT is deprecated Change-Id: I6698a810d5e6c395a18aed8066e61f8c4bae2408
This commit is contained in:
parent
4ab283fea1
commit
74a85b0f29
@ -195,7 +195,7 @@ function configure_ceilometer {
|
|||||||
|
|
||||||
# Install the policy file for the API server
|
# Install the policy file for the API server
|
||||||
cp $CEILOMETER_DIR/etc/ceilometer/policy.json $CEILOMETER_CONF_DIR
|
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/pipeline.yaml $CEILOMETER_CONF_DIR
|
||||||
cp $CEILOMETER_DIR/etc/ceilometer/event_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.
|
# API specific configuration.
|
||||||
function configure_ironic_api {
|
function configure_ironic_api {
|
||||||
iniset $IRONIC_CONF_FILE DEFAULT auth_strategy keystone
|
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).
|
# 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
|
# 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 verbose True
|
||||||
iniset $NEUTRON_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL
|
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 allow_overlapping_ips $Q_ALLOW_OVERLAPPING_IP
|
||||||
|
|
||||||
iniset $NEUTRON_CONF DEFAULT auth_strategy $Q_AUTH_STRATEGY
|
iniset $NEUTRON_CONF DEFAULT auth_strategy $Q_AUTH_STRATEGY
|
||||||
|
Loading…
Reference in New Issue
Block a user