config.py (solum-9.0.0) | : | config.py (solum-10.0.0) | ||
---|---|---|---|---|
skipping to change at line 18 | skipping to change at line 18 | |||
# | # | |||
# Unless required by applicable law or agreed to in writing, software | # Unless required by applicable law or agreed to in writing, software | |||
# distributed under the License is distributed on an "AS IS" BASIS, | # distributed under the License is distributed on an "AS IS" BASIS, | |||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or | # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or | |||
# implied. | # implied. | |||
# See the License for the specific language governing permissions and | # See the License for the specific language governing permissions and | |||
# limitations under the License. | # limitations under the License. | |||
from oslo_config import cfg | from oslo_config import cfg | |||
from oslo_middleware import cors | from oslo_middleware import cors | |||
from oslo_policy import opts | ||||
def set_config_defaults(): | def set_config_defaults(): | |||
"""This method updates all configuration default values.""" | """This method updates all configuration default values.""" | |||
set_cors_middleware_defaults() | set_cors_middleware_defaults() | |||
# TODO(gmann): Remove setting the default value of config policy_file | ||||
# once oslo_policy change the default value to 'policy.yaml'. | ||||
# https://github.com/openstack/oslo.policy/blob/a626ad12fe5a3abd49d70e3e5b95 | ||||
589d279ab578/oslo_policy/opts.py#L49 | ||||
opts.set_defaults(cfg.CONF, 'policy.yaml') | ||||
def set_cors_middleware_defaults(): | def set_cors_middleware_defaults(): | |||
"""Update default configuration options for oslo.middleware.""" | """Update default configuration options for oslo.middleware.""" | |||
# CORS Defaults | # CORS Defaults | |||
# TODO(krotscheck): Update with https://review.opendev.org/#/c/285368/ | # TODO(krotscheck): Update with https://review.opendev.org/#/c/285368/ | |||
cfg.set_defaults(cors.CORS_OPTS, | cfg.set_defaults(cors.CORS_OPTS, | |||
allow_headers=['X-Auth-Token', | allow_headers=['X-Auth-Token', | |||
'X-Openstack-Request-Id', | 'X-Openstack-Request-Id', | |||
'X-Subject-Token'], | 'X-Subject-Token'], | |||
expose_headers=['X-Auth-Token', | expose_headers=['X-Auth-Token', | |||
'X-Openstack-Request-Id', | 'X-Openstack-Request-Id', | |||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 7 lines changed or added |