Fix linters and metadata

With update of ansible-lint to version >=6.0.0 a lot of new
linters were added, that enabled by default. In order to comply
with linter rules we're applying changes to the role.

With that we also update metdata to reflect current state.

Change-Id: Ib390f06177fbac77a4285e3be86e6461fd769597
This commit is contained in:
Dmitriy Rabotyagov 2023-07-14 19:36:45 +02:00
parent c65b91b490
commit e44c99e64a
4 changed files with 29 additions and 13 deletions

View File

@ -36,12 +36,17 @@ rally_bin: "/openstack/venvs/rally-{{ rally_venv_tag }}/bin"
# Database vars # Database vars
rally_db_setup_host: "{{ openstack_db_setup_host | default('localhost') }}" rally_db_setup_host: "{{ openstack_db_setup_host | default('localhost') }}"
rally_db_setup_python_interpreter: "{{ openstack_db_setup_python_interpreter | default((rally_db_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_facts['python']['executable'])) }}" rally_db_setup_python_interpreter: |-
{{
openstack_db_setup_python_interpreter | default(
(rally_db_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_facts['python']['executable']))
}}
rally_galera_address: "{{ galera_address | default('127.0.0.1') }}" rally_galera_address: "{{ galera_address | default('127.0.0.1') }}"
rally_galera_port: 3306 rally_galera_port: 3306
rally_galera_database: rally rally_galera_database: rally
rally_galera_user: rally rally_galera_user: rally
rally_database_connection_string: mysql+pymysql://{{ rally_galera_user }}:{{ rally_galera_password }}@{{ rally_galera_address }}/{{ rally_galera_database }}?charset=utf8 rally_database_connection_string: >-
mysql+pymysql://{{ rally_galera_user }}:{{ rally_galera_password }}@{{ rally_galera_address }}/{{ rally_galera_database }}?charset=utf8
rally_openstack_git_repo: https://opendev.org/openstack/rally-openstack rally_openstack_git_repo: https://opendev.org/openstack/rally-openstack
rally_openstack_git_install_branch: master rally_openstack_git_install_branch: master

View File

@ -18,18 +18,23 @@ galaxy_info:
description: Install and configure OpenStack Rally description: Install and configure OpenStack Rally
company: Comcast Corportation company: Comcast Corportation
license: Apache2 license: Apache2
min_ansible_version: 2.2 role_name: os_rally
namespace: openstack
min_ansible_version: "2.10"
platforms: platforms:
- name: Debian - name: Debian
versions: versions:
- buster - bullseye
- name: Ubuntu - name: Ubuntu
versions: versions:
- bionic
- focal - focal
- jammy
- name: EL
versions:
- "9"
galaxy_tags: [] galaxy_tags: []
dependencies: dependencies:
- role: apt_package_pinning - role: apt_package_pinning
when: when:
- ansible_facts['pkg_mgr'] == 'apt' - ansible_facts['pkg_mgr'] == 'apt'
- openstack_openrc - role: openstack_openrc

View File

@ -25,7 +25,8 @@
- always - always
- include_role: - name: Including osa.db_setup role
include_role:
name: openstack.osa.db_setup name: openstack.osa.db_setup
apply: apply:
tags: tags:
@ -44,7 +45,8 @@
tags: tags:
- always - always
- include_tasks: rally_pre_install.yml - name: Including rally_pre_install tasks
include_tasks: rally_pre_install.yml
tags: tags:
- rally-install - rally-install
@ -57,8 +59,9 @@
when: rally_openstack_git_repo is search('http') when: rally_openstack_git_repo is search('http')
- name: Retrieve local filesystem upper constraints in CI - name: Retrieve local filesystem upper constraints in CI
command: command: >-
git --git-dir={{ rally_openstack_git_repo.split('file://')[1] }}/.git show {{ rally_openstack_git_install_branch | default('master') }}:upper-constraints.txt git --git-dir={{ rally_openstack_git_repo.split('file://')[1] }}/.git show
{{ rally_openstack_git_install_branch | default('master') }}:upper-constraints.txt
when: rally_openstack_git_repo is search('file://') when: rally_openstack_git_repo is search('file://')
register: _u_c_contents_git register: _u_c_contents_git
delegate_to: localhost delegate_to: localhost
@ -94,11 +97,13 @@
tags: tags:
- rally-install - rally-install
- include_tasks: rally_post_install.yml - name: Including rally_post_install tasks
include_tasks: rally_post_install.yml
tags: tags:
- rally-config - rally-config
- include_tasks: rally_db_setup.yml - name: Including rally_db_setup tasks
include_tasks: rally_db_setup.yml
when: inventory_hostname == groups['utility_all'][0] when: inventory_hostname == groups['utility_all'][0]
tags: tags:
- rally-config - rally-config

View File

@ -21,6 +21,7 @@
- name: Create/upgrade Rally DB schema - name: Create/upgrade Rally DB schema
command: "{{ rally_bin }}/rally db create" command: "{{ rally_bin }}/rally db create"
changed_when: false
when: when:
- rally_deployment_list_result.stdout is search("Database is missing") - rally_deployment_list_result.stdout is search("Database is missing")