From 23e388876f4d76e448871d4e51dd10692d52e887 Mon Sep 17 00:00:00 2001 From: Sergey Malyuk Date: Thu, 18 Dec 2025 16:06:21 +0300 Subject: [PATCH] fix ansible-lint errors --- roles/metr1c/README.md | 20 ++++++++++---------- roles/metr1c/defaults/main.yml | 2 +- roles/metr1c/meta/main.yml | 4 ++-- roles/metr1c/molecule/default/converge.yml | 12 ++++++------ roles/metr1c/molecule/default/verify.yml | 4 ++-- roles/metr1c/tasks/main.yml | 2 +- roles/metr1c/tasks/run_systemd.yml | 4 ++-- roles/metr1c/templates/metr1c.service.j2 | 8 ++++---- roles/metr1c/vars/main.yml | 8 ++++---- 9 files changed, 32 insertions(+), 32 deletions(-) diff --git a/roles/metr1c/README.md b/roles/metr1c/README.md index c50d0be..8f5e34f 100644 --- a/roles/metr1c/README.md +++ b/roles/metr1c/README.md @@ -11,12 +11,12 @@ None Role Variables -------------- - deploy: set true or false depending on whether we start the service or not, set false when running molecule test + metr1c_deploy: set true or false depending on whether we start the service or not, set false when running molecule test metr1c_version: metr1c version to be deployed - cluster_uuid: cluster id - cluster_admin: name of cluster admin - cluster_pw: password to authenticate as cluster admin - platform_version: version of 1c platform + metr1c_cluster_uuid: cluster id + metr1c_cluster_admin: name of cluster admin + metr1c_cluster_pw: password to authenticate as cluster admin + metr1c_platform_version: version of 1c platform metr1c_port: metr1c will listen on this port Dependencies @@ -30,12 +30,12 @@ Example Playbook ```yaml roles: - role: genlab.metr1c - deploy: false + metr1c_deploy: false metr1c_version: "0.0.1" - cluster_uuid: "111-111-111-111" - cluster_admin: "test" - cluster_pw: "testpw" - platform_version: "8.3.24.1467" + metr1c_cluster_uuid: "111-111-111-111" + metr1c_cluster_admin: "test" + metr1c_cluster_pw: "testpw" + metr1c_platform_version: "8.3.24.1467" metr1c_port: "1599" ``` diff --git a/roles/metr1c/defaults/main.yml b/roles/metr1c/defaults/main.yml index 5a61db0..15d7c5e 100644 --- a/roles/metr1c/defaults/main.yml +++ b/roles/metr1c/defaults/main.yml @@ -1,2 +1,2 @@ --- -deploy: true +metr1c_deploy: true diff --git a/roles/metr1c/meta/main.yml b/roles/metr1c/meta/main.yml index 27a5d4f..4a4d719 100644 --- a/roles/metr1c/meta/main.yml +++ b/roles/metr1c/meta/main.yml @@ -10,8 +10,8 @@ galaxy_info: platforms: - name: "Ubuntu" - versions: [ "focal", "jammy" ] + versions: ["jammy", "noble"] - galaxy_tags: [ ] + galaxy_tags: [] dependencies: [] diff --git a/roles/metr1c/molecule/default/converge.yml b/roles/metr1c/molecule/default/converge.yml index 88841d6..bcf6707 100644 --- a/roles/metr1c/molecule/default/converge.yml +++ b/roles/metr1c/molecule/default/converge.yml @@ -2,11 +2,11 @@ - name: Converge hosts: all roles: - - role: genlab.metr1c - deploy: false + - role: genlab.common.metr1c + metr1c_deploy: false metr1c_version: "0.2.0" - cluster_uuid: "123-123-1234" - cluster_admin: "admin" - cluster_pw: "testpw" - platform_version: "8.3.24.1464" + metr1c_cluster_uuid: "123-123-1234" + metr1c_cluster_admin: "admin" + metr1c_cluster_pw: "testpw" + metr1c_platform_version: "8.3.24.1464" metr1c_port: "1599" diff --git a/roles/metr1c/molecule/default/verify.yml b/roles/metr1c/molecule/default/verify.yml index 2a73d3c..8f0ace9 100644 --- a/roles/metr1c/molecule/default/verify.yml +++ b/roles/metr1c/molecule/default/verify.yml @@ -9,11 +9,11 @@ - name: "Ensure that metr1c is installed and able to run" ansible.builtin.command: cmd: /opt/metr1c/metr1c -version - register: cmd1 + register: metr1c_cmd1 changed_when: false - name: "Check metr1c version" ansible.builtin.assert: - that: "'{{ metr1c_version }}' in cmd1.stdout" + that: "'{{ metr1c_version }}' in metr1c_cmd1.stdout" success_msg: "metr1c version {{ metr1c_version }} is installed and working" fail_msg: "metr1c version {{ metr1c_version }} is not installed or not working correctly" diff --git a/roles/metr1c/tasks/main.yml b/roles/metr1c/tasks/main.yml index 1fd5de8..60db409 100644 --- a/roles/metr1c/tasks/main.yml +++ b/roles/metr1c/tasks/main.yml @@ -39,5 +39,5 @@ register: metr1c_service - name: "Start systemd service" - when: "deploy is true" + when: "metr1c_deploy is true" ansible.builtin.include_tasks: "run_systemd.yml" diff --git a/roles/metr1c/tasks/run_systemd.yml b/roles/metr1c/tasks/run_systemd.yml index f6f5bfd..22fe6ae 100644 --- a/roles/metr1c/tasks/run_systemd.yml +++ b/roles/metr1c/tasks/run_systemd.yml @@ -1,6 +1,6 @@ - name: "Set fact for daemon_reload" ansible.builtin.set_fact: - daemon_reload_required: "{{ metr1c_service.changed | bool }}" + metr1c_daemon_reload_required: "{{ metr1c_service.changed | bool }}" - name: "Make sure that the metr1c service is started" become: true @@ -8,4 +8,4 @@ name: "metr1c.service" state: started enabled: true - daemon_reload: "{{ daemon_reload_required }}" + daemon_reload: "{{ metr1c_daemon_reload_required }}" diff --git a/roles/metr1c/templates/metr1c.service.j2 b/roles/metr1c/templates/metr1c.service.j2 index 1d1aa27..b3a70e6 100644 --- a/roles/metr1c/templates/metr1c.service.j2 +++ b/roles/metr1c/templates/metr1c.service.j2 @@ -4,16 +4,16 @@ Requires=network.target [Service] # Cluster UUID, for example 07593cfe-64c2-4656-be5f-61c3226286d5 -Environment=platform1c_admin_cluster={{ cluster_uuid }} +Environment=platform1c_admin_cluster={{ metr1c_cluster_uuid }} # Name of cluster admin, e.g. Администратор -Environment=platform1c_admin_user={{ cluster_admin }} +Environment=platform1c_admin_user={{ metr1c_cluster_admin }} # Admin cluster password, e.g. 1234 -Environment=platform1c_admin_pw={{ cluster_pw }} +Environment=platform1c_admin_pw={{ metr1c_cluster_pw }} # Version of 1C platform, e.g. 8.3.24.1467 -Environment=platform1c_version={{ platform_version }} +Environment=platform1c_version={{ metr1c_platform_version }} # Metr1c port, by default 1599 Environment=metr1c_port={{ metr1c_port }} diff --git a/roles/metr1c/vars/main.yml b/roles/metr1c/vars/main.yml index 7a5ef2d..c7391e2 100644 --- a/roles/metr1c/vars/main.yml +++ b/roles/metr1c/vars/main.yml @@ -1,7 +1,7 @@ --- metr1c_version: "0.2.0" -cluster_uuid: "xxxxxxxx" -cluster_admin: "Администратор" -cluster_pw: "1234" -platform_version: "8.3.24.1467" +metr1c_cluster_uuid: "xxxxxxxx" +metr1c_cluster_admin: "Администратор" +metr1c_cluster_pw: "1234" +metr1c_platform_version: "8.3.24.1467" metr1c_port: "1599"