commit 2dda74a3d04edea9560fc288f931c81a03db83e8 Author: Jonathan Rosser Date: Thu Oct 1 16:47:35 2020 +0100 Fix linter errors Add noqa where requried http://paste.openstack.org/show/798685/ Also remove centos-7 jobs as these are not supported for Victoria and are blocking further patches merging. Change-Id: I92f9131daf23f5cd38054a0b7c385344994a2aa0 diff --git a/doc/source/conf.py b/doc/source/conf.py index f74922b..66a776c 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -240,7 +240,7 @@ latex_elements = { # author, documentclass [howto, manual, or own class]). latex_documents = [ (master_doc, 'doc-' + target_name + '.tex', - title.replace("_", "\_"), author, 'manual'), + title.replace("_", r"\_"), author, 'manual'), ] # The name of an image file (relative to this directory) to place at the top of diff --git a/library/keystone_sp b/library/keystone_sp index 622511e..38dc41a 100644 --- a/library/keystone_sp +++ b/library/keystone_sp @@ -18,7 +18,7 @@ import json # import module snippets -from ansible.module_utils.basic import * +from ansible.module_utils.basic import AnsibleModule DOCUMENTATION = """ @@ -118,5 +118,6 @@ def main(): except Exception as exp: module.fail_json(msg='Failed Process: "%s"' % exp) + if __name__ == '__main__': main() diff --git a/tasks/keystone_federation_sp_shib_setup.yml b/tasks/keystone_federation_sp_shib_setup.yml index d4c84b9..6f5f158 100644 --- a/tasks/keystone_federation_sp_shib_setup.yml +++ b/tasks/keystone_federation_sp_shib_setup.yml @@ -29,11 +29,11 @@ - name: Copy Shibboleth SP key-pair (if provided) copy: content: "{{ item.content }}" - dest: "{{ item.dest }}" + dest: "{{ item.dest }}" # noqa 206 mode: "{{ item.mode|default('0640') }}" when: - _keystone_is_first_play_host - - item.content != '' + - item.content | length > 0 with_items: - { content: "{{ shibboleth_cert_user_content }}", dest: "/etc/shibboleth/sp-cert.pem" } - { content: "{{ shibboleth_key_user_content }}", dest: "/etc/shibboleth/sp-key.pem" } diff --git a/tasks/keystone_idp_self_signed_create.yml b/tasks/keystone_idp_self_signed_create.yml index 1a50535..253b3c7 100644 --- a/tasks/keystone_idp_self_signed_create.yml +++ b/tasks/keystone_idp_self_signed_create.yml @@ -17,9 +17,8 @@ file: dest: "{{ keystone_idp.cerfile }}" state: "absent" - when: > - keystone_idp.regen_cert == true or - keystone_idp.regen_cert == "True" + when: + - keystone_idp.regen_cert | bool - name: Create IdP self-signed ssl cert command: > diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 34516d8..c83317b 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -23,9 +23,7 @@ - release-notes-jobs-python3 check: jobs: - - openstack-ansible-uw_apache-centos-7 - openstack-ansible-uw_apache-ubuntu-bionic gate: jobs: - - openstack-ansible-uw_apache-centos-7 - openstack-ansible-uw_apache-ubuntu-bionic