config.py (sahara-14.0.0) | : | config.py (sahara-15.0.0) | ||
---|---|---|---|---|
skipping to change at line 17 | skipping to change at line 17 | |||
# http://www.apache.org/licenses/LICENSE-2.0 | # http://www.apache.org/licenses/LICENSE-2.0 | |||
# | # | |||
# 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_middleware import cors | from oslo_middleware import cors | |||
from oslo_policy import opts | ||||
from sahara import config | ||||
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://opendev.org/openstack/oslo.policy/src/commit/d8534850d9238e85ae0ea | ||||
55bf2ac8583681fdb2b/oslo_policy/opts.py#L49 | ||||
opts.set_defaults(config.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.set_defaults( | cors.set_defaults( | |||
allow_headers=['X-Auth-Token', | allow_headers=['X-Auth-Token', | |||
'X-Identity-Status', | 'X-Identity-Status', | |||
'X-Roles', | 'X-Roles', | |||
'X-Service-Catalog', | 'X-Service-Catalog', | |||
'X-User-Id', | 'X-User-Id', | |||
'X-Tenant-Id', | 'X-Tenant-Id', | |||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 9 lines changed or added |