openstack/openstack-ansible-os_magnum
Code Issues Proposed changes

Fix linter errors

Browse Source 
We also fix magnum config in order to work with bind-to-mgmt,
until [1] got merged

[1] https://review.opendev.org/733408

Depends-On: https://review.opendev.org/763049
Change-Id: Iaa7a0aae186eaf080b7be3949821ed9e90c52456
This commit is contained in:
Jonathan Rosser 2020-10-01 16:48:25 +01:00 committed by Dmitriy Rabotyagov (noonedeadpunk)
parent 7256fbafdc
commit 7c90bb1729
3 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/conf.py
View File

@ -231,7 +231,7 @@ latex_elements = {
# author, documentclass [howto, manual, or own class]). # author, documentclass [howto, manual, or own class]).
latex_documents = [ latex_documents = [
(master_doc, 'doc-' + target_name + '.tex', (master_doc, 'doc-' + target_name + '.tex',
title.replace("_", "\_"), author, 'manual'), title.replace("_", r"\_"), author, 'manual'),
] ]
latex_use_xindy = False latex_use_xindy = False

19
templates/magnum.conf.j2
View File

@ -34,30 +34,17 @@ region_name = {{ magnum_heat_service_region }}
endpoint_type = internalURL endpoint_type = internalURL
[keystone_auth] [keystone_auth]
auth_uri = {{ keystone_service_publicurl }} auth_section = keystone_authtoken
www_authenticate_uri = {{ keystone_service_publicurl }}
auth_version = v3
insecure = {{ keystone_service_internaluri_insecure | bool }}
memcached_servers = {{ magnum_memcached_servers }}
token_cache_time = 300
auth_type = {{ magnum_keystone_auth_plugin }}
auth_url = {{ keystone_service_internaluri }}
project_domain_name = {{ magnum_service_project_domain_name }}
user_domain_name = {{ magnum_service_user_domain_name }}
project_name = {{ magnum_service_project_name }}
username = {{ magnum_service_user_name }}
password = {{ magnum_service_password }}
[keystone_authtoken] [keystone_authtoken]
region_name = {{ magnum_keystone_service_region }} region_name = {{ magnum_keystone_service_region }}
auth_uri = {{ keystone_service_publicurl }} www_authenticate_uri = {{ keystone_service_internaluri }}
www_authenticate_uri = {{ keystone_service_publicurl }}
auth_version = v3 auth_version = v3
insecure = {{ keystone_service_internaluri_insecure | bool }} insecure = {{ keystone_service_internaluri_insecure | bool }}
memcached_servers = {{ magnum_memcached_servers }} memcached_servers = {{ magnum_memcached_servers }}
token_cache_time = 300 token_cache_time = 300
auth_type = {{ magnum_keystone_auth_plugin }} auth_type = {{ magnum_keystone_auth_plugin }}
auth_url = {{ keystone_service_internaluri }} auth_url = {{ keystone_service_internalurl }}
project_domain_name = {{ magnum_service_project_domain_name }} project_domain_name = {{ magnum_service_project_domain_name }}
user_domain_name = {{ magnum_service_user_domain_name }} user_domain_name = {{ magnum_service_user_domain_name }}
project_name = {{ magnum_service_project_name }} project_name = {{ magnum_service_project_name }}