fix(CI): create user with duplciate code even

meysam81 · Sep 21, 2024 · 9c93e05 · 9c93e05
1 parent b1c241b
commit 9c93e05
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 100 deletions.
diff --git a/roles/promtail/meta/main.yml b/roles/promtail/meta/main.yml
@@ -28,6 +28,4 @@ galaxy_info:
     - promtail
     - observability
 
-dependencies:
-  - name: meysam81.general.system_user
-    version: "<=2.0.0"
+dependencies: []
diff --git a/roles/promtail/tasks/main.yml b/roles/promtail/tasks/main.yml
@@ -1,4 +1,6 @@
 ---
+- name: Create promtail system user
+  ansible.builtin.import_tasks: user.yml
 - name: Setup Debian
   ansible.builtin.include_tasks: setup-Debian.yml
   when: ansible_os_family == 'Debian'
diff --git a/roles/system_user/tasks/main.yml → roles/promtail/tasks/user.yml b/roles/system_user/tasks/main.yml → roles/promtail/tasks/user.yml
@@ -1,16 +1,16 @@
----
-- name: Create group {{ system_user_group }}
+- name: Create group {{ promtail_group }}
   ansible.builtin.group:
-    name: "{{ system_user_group }}"
+    name: "{{ promtail_group }}"
     state: present
     system: true
   register: created_group
-- name: Create user {{ system_user_user }}
+- name: Create user {{ promtail_user }}
   ansible.builtin.user:
-    name: "{{ system_user_user }}"
+    name: "{{ promtail_user }}"
     state: present
     system: true
     shell: /bin/false
     create_home: true
     group: "{{ created_group.name }}"
-    groups: "{{ system_user_groups | default(omit) }}"
+    groups:
+      - adm
diff --git a/roles/promtail/vars/main.yml b/roles/promtail/vars/main.yml
@@ -1,7 +1,2 @@
 ---
-system_user_user: "{{ promtail_user }}"
-system_user_group: "{{ promtail_group }}"
-system_user_extra_groups:
-  - adm
-
 promtail_remote_write_url:
diff --git a/roles/system_user/README.md b/roles/system_user/README.md
diff --git a/roles/system_user/defaults/main.yml b/roles/system_user/defaults/main.yml
diff --git a/roles/system_user/handlers/main.yml b/roles/system_user/handlers/main.yml
diff --git a/roles/system_user/meta/main.yml b/roles/system_user/meta/main.yml
diff --git a/roles/system_user/tests/inventory b/roles/system_user/tests/inventory
diff --git a/roles/system_user/tests/test.yml b/roles/system_user/tests/test.yml
diff --git a/roles/system_user/vars/main.yml b/roles/system_user/vars/main.yml
diff --git a/roles/vmagent/meta/main.yml b/roles/vmagent/meta/main.yml
@@ -27,5 +27,6 @@ galaxy_info:
     - victoriametrics
     - observability
     - vmagent
+    - metrics
 
 dependencies: []