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/ansible-role-systemd_service/+/888223
Change-Id: Ice967ef99da11e6bd5a7dffc0a5e3d377f8598f4
This commit is contained in:
Dmitriy Rabotyagov 2023-07-14 21:30:29 +02:00
parent a0b2ef25cd
commit dddc665165
6 changed files with 52 additions and 31 deletions

View File

@ -33,7 +33,11 @@ zun_venv_python_executable: "{{ openstack_venv_python_executable | default('pyth
# for the service setup. The host must already have
# clouds.yaml properly configured.
zun_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}"
zun_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((zun_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_facts['python']['executable'])) }}"
zun_service_setup_host_python_interpreter: >-
{{
openstack_service_setup_host_python_interpreter | default(
(zun_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_facts['python']['executable']))
}}
# Set the package install state for distribution packages
# Options are 'present' and 'latest'
@ -50,7 +54,8 @@ zun_kuryr_git_install_branch: master
zun_kuryr_lib_git_repo: https://opendev.org/openstack/kuryr
zun_kuryr_lib_git_install_branch: master
zun_upper_constraints_url: "{{ requirements_git_url | default('https://releases.openstack.org/constraints/upper/' ~ requirements_git_install_branch | default('master')) }}"
zun_upper_constraints_url: >-
{{ requirements_git_url | default('https://releases.openstack.org/constraints/upper/' ~ requirements_git_install_branch | default('master')) }}
zun_git_constraints:
- "--constraint {{ zun_upper_constraints_url }}"
@ -85,7 +90,8 @@ zun_kuryr_log_dir: "/var/log/kuryr"
zun_docker_package_version: "{{ _zun_docker_package_version }}"
zun_containerd_package_version: "{{ _zun_containerd_package_version }}"
zun_kata_package_version: "3.1.0"
zun_kata_package_source: "https://github.com/kata-containers/kata-containers/releases/download/{{ zun_kata_package_version }}/kata-static-{{ zun_kata_package_version }}-x86_64.tar.xz"
zun_kata_package_source: >-
https://github.com/kata-containers/kata-containers/releases/download/{{ zun_kata_package_version }}/kata-static-{{ zun_kata_package_version }}-x86_64.tar.xz
zun_kata_package_checksum: sha256:452cc850e021539c14359d016aba18ddba128f59aa9ab637738296d9b5cd78a0
zun_kata_enabled: "True"
@ -124,7 +130,11 @@ zun_docker_prune_frequency: hour
## Database info
zun_db_setup_host: "{{ openstack_db_setup_host | default('localhost') }}"
zun_db_setup_python_interpreter: "{{ openstack_db_setup_python_interpreter | default((zun_db_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_facts['python']['executable'])) }}"
zun_db_setup_python_interpreter: >-
{{
openstack_db_setup_python_interpreter | default((zun_db_setup_host == 'localhost') | ternary(
ansible_playbook_python, ansible_facts['python']['executable']))
}}
zun_galera_address: "{{ galera_address | default('127.0.0.1') }}"
zun_galera_user: zun
zun_galera_database: zun
@ -242,7 +252,8 @@ zun_container_runtime: runc
## Cap the maximun number of threads / workers when a user value is unspecified.
zun_api_threads_max: 16
zun_api_threads: "{{ [[(ansible_facts['processor_vcpus']//ansible_facts['processor_threads_per_core'])|default(1), 1] | max * 2, zun_api_threads_max] | min }}"
zun_api_threads: >-
{{ [[(ansible_facts['processor_vcpus'] // ansible_facts['processor_threads_per_core']) | default(1), 1] | max * 2, zun_api_threads_max] | min }}
zun_service_in_ldap: "{{ service_ldap_backend_enabled | default(False) }}"
@ -379,7 +390,7 @@ zun_docker_init_defaults:
Service:
ExecStart:
- ""
- "/usr/bin/dockerd --group {{ zun_system_group_name }} -H tcp://{{ zun_docker_bind_host }}:{{ zun_docker_bind_port }} -H unix:///var/run/docker.sock --cluster-store {{ zun_docker_kv_storage }}://{% for item in groups[zun_docker_kv_group] %}{{ hostvars[item]['management_address'] }}:{{ zun_docker_kv_port }}{% if not loop.last %},{% endif %}{% endfor %}{% if zun_kata_enabled %} --add-runtime kata=/opt/kata/bin/kata-runtime{% endif %}"
- "/usr/bin/dockerd --group {{ zun_system_group_name }} -H tcp://{{ zun_docker_bind_host }}:{{ zun_docker_bind_port }} -H unix:///var/run/docker.sock --cluster-store {{ zun_docker_kv_storage }}://{% for item in groups[zun_docker_kv_group] %}{{ hostvars[item]['management_address'] }}:{{ zun_docker_kv_port }}{% if not loop.last %},{% endif %}{% endfor %}{% if zun_kata_enabled %} --add-runtime kata=/opt/kata/bin/kata-runtime{% endif %}" # noqa: yaml[line-length]
## Tunable overrides for service unit files.
zun_api_paste_ini_overrides: {}

View File

@ -18,22 +18,23 @@ galaxy_info:
description: Installation and setup of zun
company: Rackspace
license: Apache2
min_ansible_version: 2.4
role_name: os_zun
namespace: openstack
min_ansible_version: "2.10"
platforms:
- name: Debian
versions:
- buster
- bullseye
- name: Ubuntu
versions:
- focal
- jammy
- name: EL
versions:
- 8
categories:
- "9"
galaxy_tags:
- cloud
- python
- zun
- development
- openstack
dependencies:
- apt_package_pinning

View File

@ -29,7 +29,8 @@
tags:
- always
- import_tasks: zun_pre_install.yml
- name: Importing zun_pre_install tasks
import_tasks: zun_pre_install.yml
tags:
- zun-install
@ -81,7 +82,8 @@
tags:
- zun-install
- include_role:
- name: Including osa.mq_setup role
include_role:
name: openstack.osa.mq_setup
apply:
tags:
@ -105,7 +107,8 @@
tags:
- always
- include_role:
- name: Including osa.db_setup role
include_role:
name: openstack.osa.db_setup
apply:
tags:
@ -127,7 +130,8 @@
tags:
- always
- include_role:
- name: Including osa.service_setup role
include_role:
name: openstack.osa.service_setup
apply:
tags:
@ -167,13 +171,15 @@
tags:
- always
- import_tasks: zun_compute.yml
- name: Importing zun_post_install tasks
import_tasks: zun_compute.yml
when:
- "zun_services['zun-compute']['group'] in group_names"
tags:
- zun-compute
- import_tasks: zun_post_install.yml
- name: Importing zun_post_install tasks
import_tasks: zun_post_install.yml
tags:
- zun-config
@ -196,10 +202,10 @@
systemd_tempd_prefix: openstack
systemd_slice_name: "{{ zun_system_slice_name }}"
systemd_lock_dir: "{{ zun_lock_dir }}"
systemd_CPUAccounting: true
systemd_BlockIOAccounting: true
systemd_MemoryAccounting: true
systemd_TasksAccounting: true
systemd_service_cpu_accounting: true
systemd_service_block_io_accounting: true
systemd_service_memory_accounting: true
systemd_service_tasks_accounting: true
systemd_services: "{{ filtered_zun_services }}"
tags:
- zun-config

View File

@ -36,7 +36,7 @@
get_url:
url: "{{ item.gpg_uri }}"
dest: "/tmp/{{ item.name }}"
mode: 0440
mode: "0440"
with_items: "{{ zun_docker_repo }}"
- name: Add Apt signing key on remote server to keyring
@ -314,6 +314,7 @@
file:
path: "/var/tmp/zun-docker-cleanup.disabled"
state: "{{ zun_docker_prune_images | ternary('absent', 'touch') }}"
mode: "0644"
- name: Remove legacy systemd docker override
file:

View File

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
- name: create the system group
- name: Create the system group
group:
name: "{{ zun_system_group_name }}"
gid: "{{ zun_system_group_gid | default(omit) }}"

View File

@ -18,7 +18,9 @@ _zun_containerd_package_version: "1.6.20-1"
zun_docker_repo:
- name: "docker-ce"
repo: "deb [arch=amd64] https://download.docker.com/linux/{{ ansible_facts['distribution'] | lower }} {{ ansible_facts['distribution_release'] | lower }} stable"
repo: >-
deb [arch=amd64] https://download.docker.com/linux/{{ ansible_facts['distribution'] | lower }} {{
ansible_facts['distribution_release'] | lower }} stable
gpg_uri: "https://download.docker.com/linux/{{ ansible_facts['distribution'] | lower }}/gpg"
# Common apt packages