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.

Depends-On: https://review.opendev.org/c/openstack/openstack-ansible/+/892910
Change-Id: I86c4805a0ac82d849f7470a02f6774e59a3b773f
This commit is contained in:
Dmitriy Rabotyagov 2023-07-14 19:45:26 +02:00 committed by Dmitriy Rabotyagov
parent 0f9a042d59
commit 1197986d95
6 changed files with 54 additions and 31 deletions

View File

@ -26,7 +26,11 @@ debug: False
# for the service setup. The host must already have # for the service setup. The host must already have
# clouds.yaml properly configured. # clouds.yaml properly configured.
senlin_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}" senlin_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}"
senlin_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((senlin_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_facts['python']['executable'])) }}" senlin_service_setup_host_python_interpreter: >-
{{
openstack_service_setup_host_python_interpreter | default(
(senlin_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_facts['python']['executable']))
}}
# Set the package install state for distribution packages # Set the package install state for distribution packages
# Options are 'present' and 'latest' # Options are 'present' and 'latest'
@ -38,7 +42,8 @@ senlin_venv_python_executable: "{{ openstack_venv_python_executable | default('p
senlin_git_repo: https://opendev.org/openstack/senlin senlin_git_repo: https://opendev.org/openstack/senlin
senlin_git_install_branch: master senlin_git_install_branch: master
senlin_upper_constraints_url: "{{ requirements_git_url | default('https://releases.openstack.org/constraints/upper/' ~ requirements_git_install_branch | default('master')) }}" senlin_upper_constraints_url: >-
{{ requirements_git_url | default('https://releases.openstack.org/constraints/upper/' ~ requirements_git_install_branch | default('master')) }}
senlin_git_constraints: senlin_git_constraints:
- "--constraint {{ senlin_upper_constraints_url }}" - "--constraint {{ senlin_upper_constraints_url }}"
@ -52,7 +57,11 @@ senlin_fatal_deprecations: False
## Database info ## Database info
senlin_db_setup_host: "{{ openstack_db_setup_host | default('localhost') }}" senlin_db_setup_host: "{{ openstack_db_setup_host | default('localhost') }}"
senlin_db_setup_python_interpreter: "{{ openstack_db_setup_python_interpreter | default((senlin_db_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_facts['python']['executable'])) }}" senlin_db_setup_python_interpreter: >-
{{
openstack_db_setup_python_interpreter | default(
(senlin_db_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_facts['python']['executable']))
}}
senlin_galera_address: "{{ galera_address | default('127.0.0.1') }}" senlin_galera_address: "{{ galera_address | default('127.0.0.1') }}"
senlin_galera_user: senlin senlin_galera_user: senlin
senlin_galera_database: senlin senlin_galera_database: senlin
@ -177,14 +186,15 @@ senlin_service_down_time: 60
## Cap the maximum number of threads / workers when a user value is unspecified. ## Cap the maximum number of threads / workers when a user value is unspecified.
senlin_api_threads_max: 16 senlin_api_threads_max: 16
senlin_api_threads: "{{ [[(ansible_facts['processor_vcpus']//ansible_facts['processor_threads_per_core'])|default(1), 1] | max * 2, senlin_api_threads_max] | min }}" senlin_api_threads: >-
{{ [[(ansible_facts['processor_vcpus'] // ansible_facts['processor_threads_per_core']) | default(1), 1] | max * 2, senlin_api_threads_max] | min }}
senlin_service_in_ldap: "{{ service_ldap_backend_enabled | default(False) }}" senlin_service_in_ldap: "{{ service_ldap_backend_enabled | default(False) }}"
## Policy vars ## Policy vars
# Provide a list of access controls to update the default policy.json with. These changes will be merged # Provide a list of access controls to update the default policy.json with. These changes will be merged
# with the access controls in the default policy.json. E.g. # with the access controls in the default policy.json. E.g.
#senlin_policy_overrides: # senlin_policy_overrides:
# "cloudformation:ListStacks": "rule:deny_stack_user" # "cloudformation:ListStacks": "rule:deny_stack_user"
# "cloudformation:CreateStack": "rule:deny_stack_user" # "cloudformation:CreateStack": "rule:deny_stack_user"
@ -260,10 +270,10 @@ senlin_required_secrets:
# uWSGI Settings # uWSGI Settings
senlin_api_uwsgi_ini_overrides: {} senlin_api_uwsgi_ini_overrides: {}
senlin_wsgi_processes_max: 16 senlin_wsgi_processes_max: 16
senlin_wsgi_processes: "{{ [[ansible_facts['processor_vcpus']|default(1), 1] | max * 2, senlin_wsgi_processes_max] | min }}" senlin_wsgi_processes: "{{ [[ansible_facts['processor_vcpus'] | default(1), 1] | max * 2, senlin_wsgi_processes_max] | min }}"
senlin_wsgi_threads: 1 senlin_wsgi_threads: 1
senlin_api_uwsgi_bind_address: "{{ openstack_service_bind_address | default('0.0.0.0') }}" senlin_api_uwsgi_bind_address: "{{ openstack_service_bind_address | default('0.0.0.0') }}"
#senlin_api_cfn_uwsgi_bind_address: "{{ openstack_service_bind_address | default('0.0.0.0') }}" # senlin_api_cfn_uwsgi_bind_address: "{{ openstack_service_bind_address | default('0.0.0.0') }}"
senlin_uwsgi_tls: senlin_uwsgi_tls:
crt: "{{ senlin_ssl_cert }}" crt: "{{ senlin_ssl_cert }}"
key: "{{ senlin_ssl_key }}" key: "{{ senlin_ssl_key }}"
@ -323,5 +333,5 @@ senlin_pki_install_certificates:
mode: "0600" mode: "0600"
# Define user-provided SSL certificates # Define user-provided SSL certificates
#senlin_user_ssl_cert: <path to cert on ansible deployment host> # senlin_user_ssl_cert: <path to cert on ansible deployment host>
#senlin_user_ssl_key: <path to cert on ansible deployment host> # senlin_user_ssl_key: <path to cert on ansible deployment host>

View File

@ -18,19 +18,20 @@ galaxy_info:
description: Installation and setup of senlin description: Installation and setup of senlin
company: Rackspace company: Rackspace
license: Apache2 license: Apache2
min_ansible_version: 2.2 role_name: os_senlin
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 - name: EL
versions: versions:
- 8 - "9"
categories: galaxy_tags:
- cloud - cloud
- python - python
- senlin - senlin

View File

@ -51,7 +51,8 @@
tags: tags:
- 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:
@ -72,7 +73,8 @@
tags: tags:
- always - always
- include_role: - name: Including osa.mq_setup role
include_role:
name: openstack.osa.mq_setup name: openstack.osa.mq_setup
apply: apply:
tags: tags:
@ -94,11 +96,13 @@
tags: tags:
- always - always
- import_tasks: senlin_pre_install.yml - name: Importing senlin_pre_install tasks
import_tasks: senlin_pre_install.yml
tags: tags:
- senlin-install - senlin-install
- import_tasks: senlin_install.yml - name: Importing senlin_install tasks
import_tasks: senlin_install.yml
tags: tags:
- senlin-install - senlin-install
@ -122,7 +126,8 @@
tags: tags:
- always - always
- import_tasks: senlin_post_install.yml - name: Importing senlin_post_install tasks
import_tasks: senlin_post_install.yml
tags: tags:
- senlin-config - senlin-config
@ -135,16 +140,17 @@
systemd_tempd_prefix: openstack systemd_tempd_prefix: openstack
systemd_slice_name: senlin systemd_slice_name: senlin
systemd_lock_path: /var/lock/senlin systemd_lock_path: /var/lock/senlin
systemd_CPUAccounting: true systemd_service_cpu_accounting: true
systemd_BlockIOAccounting: true systemd_service_block_io_accounting: true
systemd_MemoryAccounting: true systemd_service_memory_accounting: true
systemd_TasksAccounting: true systemd_service_tasks_accounting: true
systemd_services: "{{ filtered_senlin_services }}" systemd_services: "{{ filtered_senlin_services }}"
tags: tags:
- senlin-config - senlin-config
- systemd-service - systemd-service
- import_tasks: senlin_db_sync.yml - name: Importing senlin_db_sync tasks
import_tasks: senlin_db_sync.yml
when: when:
- _senlin_is_first_play_host - _senlin_is_first_play_host
tags: tags:
@ -160,7 +166,8 @@
- senlin-config - senlin-config
- uwsgi - uwsgi
- include_role: - name: Including osa.service_setup role
include_role:
name: openstack.osa.service_setup name: openstack.osa.service_setup
apply: apply:
tags: tags:

View File

@ -19,6 +19,7 @@
section: "senlin" section: "senlin"
option: "install_method" option: "install_method"
value: "{{ senlin_install_method }}" value: "{{ senlin_install_method }}"
mode: "0644"
- name: Refresh local facts to ensure the senlin section is present - name: Refresh local facts to ensure the senlin section is present
setup: setup:

View File

@ -13,7 +13,7 @@
# 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.
- name: create the system group - name: Create the system group
group: group:
name: "{{ senlin_system_group_name }}" name: "{{ senlin_system_group_name }}"
state: "present" state: "present"
@ -56,8 +56,8 @@
src: "{{ item.src | default(omit) }}" src: "{{ item.src | default(omit) }}"
dest: "{{ item.dest | default(omit) }}" dest: "{{ item.dest | default(omit) }}"
state: "{{ item.state | default('directory') }}" state: "{{ item.state | default('directory') }}"
owner: "{{ item.owner|default(senlin_system_user_name) }}" owner: "{{ item.owner | default(senlin_system_user_name) }}"
group: "{{ item.group|default(senlin_system_group_name) }}" group: "{{ item.group | default(senlin_system_group_name) }}"
mode: "{{ item.mode | default(omit) }}" mode: "{{ item.mode | default(omit) }}"
force: "{{ item.force | default(omit) }}" force: "{{ item.force | default(omit) }}"
when: when:

View File

@ -13,7 +13,11 @@
# 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.
_senlin_is_first_play_host: "{{ (senlin_services['senlin-api']['group'] in group_names and inventory_hostname == (groups[senlin_services['senlin-api']['group']] | intersect(ansible_play_hosts)) | first) | bool }}" _senlin_is_first_play_host: >-
{{
(senlin_services['senlin-api']['group'] in group_names and
inventory_hostname == (groups[senlin_services['senlin-api']['group']] | intersect(ansible_play_hosts)) | first) | bool
}}
# #
# Compile a list of the services on a host based on whether # Compile a list of the services on a host based on whether