From 6c783cde7865053430986a3d9477f31c45ecfc34 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Fri, 14 Jul 2023 20:17:05 +0200 Subject: [PATCH] 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: Iaa81bfe9c524d9818d19019d5a09cf8e817d8396 --- defaults/main.yml | 11 +++++++---- handlers/main.yml | 7 ++++--- meta/main.yml | 3 ++- tasks/main.yml | 19 +++++++++++-------- tasks/zookeeper_install.yml | 1 + tasks/zookeeper_post_install.yml | 1 + tasks/zookeeper_pre_install.yml | 4 ++-- vars/main.yml | 4 ++-- 8 files changed, 30 insertions(+), 20 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 4f101f4..3a7c100 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -15,8 +15,10 @@ # Define zookepeer version and download URI zookeeper_download_version: 3.7.1 -zookeeper_download_version_checksum: sha512:9103628a50745fa1a289bca666fda4a9c08ec17c55cf13e66887e7ba76e93dbae60a1f1ffd6c10798be3a16069344ecbc00cebb29bf03d9cd7096ccd098ed011 -zookeeper_download_url: "https://dlcdn.apache.org/zookeeper/zookeeper-{{ zookeeper_download_version }}/apache-zookeeper-{{ zookeeper_download_version }}-bin.tar.gz" +zookeeper_download_version_checksum: >- + sha512:9103628a50745fa1a289bca666fda4a9c08ec17c55cf13e66887e7ba76e93dbae60a1f1ffd6c10798be3a16069344ecbc00cebb29bf03d9cd7096ccd098ed011 +zookeeper_download_url: >- + https://dlcdn.apache.org/zookeeper/zookeeper-{{ zookeeper_download_version }}/apache-zookeeper-{{ zookeeper_download_version }}-bin.tar.gz # Define zookeeper clustering option zookeeper_cluster_members: "{{ groups['zookeeper_all'] }}" @@ -83,7 +85,8 @@ zookeeper_pki_install_ca: zookeeper_pki_keys_path: "{{ zookeeper_pki_dir ~ '/certs/private/' }}" zookeeper_pki_certs_path: "{{ zookeeper_pki_dir ~ '/certs/certs/' }}" zookeeper_pki_intermediate_cert_name: "{{ openstack_pki_service_intermediate_cert_name | default('ZookeeperIntermediate') }}" -zookeeper_pki_intermediate_cert_path: "{{ zookeeper_pki_dir ~ '/roots/' ~ zookeeper_pki_intermediate_cert_name ~ '/certs/' ~ zookeeper_pki_intermediate_cert_name ~ '.crt' }}" +zookeeper_pki_intermediate_cert_path: >- + {{ zookeeper_pki_dir ~ '/roots/' ~ zookeeper_pki_intermediate_cert_name ~ '/certs/' ~ zookeeper_pki_intermediate_cert_name ~ '.crt' }} zookeeper_pki_regen_cert: '' zookeeper_pki_certificates: - name: "zookeeper_{{ ansible_facts['hostname'] }}" @@ -130,7 +133,7 @@ zookeeper_system_comment: zookeeper system user zookeeper_system_shell: /bin/false zookeeper_system_user_home: /var/lib/zookeeper -zookeeper_file_zoo_conf_mode: 0644 +zookeeper_file_zoo_conf_mode: "0644" zookeeper_config_dir: "/etc/zookeeper" zookeeper_data_dir: "{{ zookeeper_system_user_home }}" zookeeper_data_log_dir: "{{ zookeeper_data_dir }}/log" diff --git a/handlers/main.yml b/handlers/main.yml index a396d62..acb38a2 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -13,9 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -- name: regen pem - shell: > - cat {{ zookeeper_ssl_cert }} $(test -f {{ zookeeper_ssl_ca_cert }} && echo {{ zookeeper_ssl_ca_cert }}) {{ zookeeper_ssl_key }} > {{ zookeeper_ssl_keystore_location }} +- name: Regen pem # noqa: no-changed-when + shell: >- + cat {{ zookeeper_ssl_cert }} $(test -f {{ zookeeper_ssl_ca_cert }} && + echo {{ zookeeper_ssl_ca_cert }}) {{ zookeeper_ssl_key }} > {{ zookeeper_ssl_keystore_location }} notify: Restart zookeeper listen: - cert installed diff --git a/meta/main.yml b/meta/main.yml index 43ab775..9f0b030 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -16,8 +16,9 @@ galaxy_info: author: OpenStack-Ansible Contributors role_name: zookeeper + namespace: openstack description: | Zookeeper is a high-performance coordination service for distributed applications. license: Apache - min_ansible_version: 5.0 + min_ansible_version: "5.0" dependencies: [] diff --git a/tasks/main.yml b/tasks/main.yml index d5bc456..e9f32d9 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -28,21 +28,24 @@ tags: - always -- import_tasks: zookeeper_pre_install.yml +- name: Importing zookeeper_pre_install tasks + import_tasks: zookeeper_pre_install.yml tags: - zookeeper-install -- import_tasks: zookeeper_install.yml +- name: Importing zookeeper_install tasks + import_tasks: zookeeper_install.yml tags: - zookeeper-install -- import_tasks: zookeeper_post_install.yml +- name: Importing zookeeper_post_install tasks + import_tasks: zookeeper_post_install.yml tags: - zookeeper-config - name: Create and install SSL certificates include_role: - name: pki + name: pki vars: pki_setup_host: "{{ zookeeper_pki_setup_host }}" pki_dir: "{{ zookeeper_pki_dir }}" @@ -66,10 +69,10 @@ systemd_tempd_prefix: openstack systemd_slice_name: zookeeper systemd_lock_path: /var/lock/zookeeper - 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: - service_name: "{{ zookeeper_service['name'] }}" enabled: yes diff --git a/tasks/zookeeper_install.yml b/tasks/zookeeper_install.yml index 3145e33..8df26d4 100644 --- a/tasks/zookeeper_install.yml +++ b/tasks/zookeeper_install.yml @@ -28,6 +28,7 @@ url: "{{ zookeeper_download_url }}" dest: "/opt/{{ zookeeper_download_url | basename }}" checksum: "{{ zookeeper_download_version_checksum }}" + mode: "0644" register: zookeeper_download - name: Unarchive downloaded zookeeper diff --git a/tasks/zookeeper_post_install.yml b/tasks/zookeeper_post_install.yml index bc1355f..9c19df7 100644 --- a/tasks/zookeeper_post_install.yml +++ b/tasks/zookeeper_post_install.yml @@ -18,6 +18,7 @@ src: "{{ item }}" dest: "{{ zookeeper_config_dir }}/{{ item | basename }}" remote_src: yes + mode: "0644" with_items: - "/opt/zookeeper-{{ zookeeper_download_version }}/conf/configuration.xsl" - "/opt/zookeeper-{{ zookeeper_download_version }}/conf/log4j.properties" diff --git a/tasks/zookeeper_pre_install.yml b/tasks/zookeeper_pre_install.yml index bd4b32d..9667676 100644 --- a/tasks/zookeeper_pre_install.yml +++ b/tasks/zookeeper_pre_install.yml @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -- name: create the system group +- name: Create the system group group: name: "{{ zookeeper_system_group_name }}" gid: "{{ zookeeper_system_group_gid | default(omit) }}" @@ -36,7 +36,7 @@ path: "{{ item }}" owner: "{{ zookeeper_system_user_name }}" group: "{{ zookeeper_system_group_name }}" - mode: 0750 + mode: "0750" state: directory with_items: - "{{ zookeeper_config_dir }}" diff --git a/vars/main.yml b/vars/main.yml index 67460e8..1af2ed1 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -15,7 +15,7 @@ zookeeper_cluster_id: >- {%- for member in zookeeper_cluster_members -%} - {%- if hostvars[member]['ansible_host'] == ansible_host -%} + {%- if hostvars[member]['ansible_host'] == ansible_host -%} {{ loop.index }} - {%- endif -%} + {%- endif -%} {%- endfor -%}