Merge "Fix linter errors"

This commit is contained in:
Zuul 2020-10-06 13:08:33 +00:00 committed by Gerrit Code Review
commit 1f88699b05
3 changed files with 8 additions and 8 deletions

View File

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

View File

@ -17,7 +17,7 @@
# import module snippets
from ansible.module_utils.basic import *
from ansible.module_utils.basic import AnsibleModule
DOCUMENTATION = """
@ -216,8 +216,8 @@ class ProviderNetworksParsing(object):
if (
set(
net["network"]["group_binds"]
).intersection(group_names) or
"neutron_server" in group_names
).intersection(group_names)
or "neutron_server" in group_names # noqa W503
):
if "vlan" not in self.network_types:
self.network_types.append('vlan')
@ -239,8 +239,8 @@ class ProviderNetworksParsing(object):
if (
set(
net["network"]["group_binds"]
).intersection(group_names) or
"neutron_server" in group_names
).intersection(group_names)
or "neutron_server" in group_names # noqa W503
):
if "flat" not in self.network_types:
self.network_types.append('flat')

View File

@ -23,11 +23,11 @@
- name: Set ODL as OvS manager
command: ovs-vsctl set-manager {{ ovs_manager_list }}
when: ovs_manager.stdout == ""
when: ovs_manager.stdout | length == 0
- name: Configure hosts for networking-odl, force kernel datapath
command: "{{ neutron_bin }}/neutron-odl-ovs-hostconfig --noovs_dpdk {% if neutron_provider_networks.network_mappings is defined and 'odl-router_v2' in neutron_plugin_base or 'odl-router' in neutron_plugin_base %}--datapath_type=system --bridge_mappings={{ neutron_provider_networks.network_mappings }} {% endif %}"
when: ovs_manager.stdout == ""
when: ovs_manager.stdout | length == 0
- name: Retrieve current OvS local ip
command: ovs-vsctl get Open_vSwitch . other_config:local_ip