Split service task into separate file (#6)

nephelaiio · Nov 8, 2023 · 3b0a72e · 3b0a72e
1 parent ec542e6
commit 3b0a72e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/meta/main.yml b/meta/main.yml
@@ -17,6 +17,4 @@ galaxy_info:
         - all
   galaxy_tags: ['heartbeat']
 
-dependencies:
-  - name: nephelaiio.elastic_repo
-    when: heartbeat_repo_manage
+dependencies: []
diff --git a/molecule/7x/molecule.yml b/molecule/7x/molecule.yml
@@ -4,7 +4,7 @@ dependency:
 driver:
   name: docker
 platforms:
-  - name: instance
+  - name: heartbeat-7x
     image: "geerlingguy/docker-${MOLECULE_DOCKER_IMAGE:-ubuntu2004}-ansible:latest"
     command: ${MOLECULE_DOCKER_COMMAND:-""}
     cgroupns_mode: host

diff --git a/molecule/8x/molecule.yml b/molecule/8x/molecule.yml
@@ -4,7 +4,7 @@ dependency:
 driver:
   name: docker
 platforms:
-  - name: instance
+  - name: heartbeat-8x
     image: "geerlingguy/docker-${MOLECULE_DOCKER_IMAGE:-ubuntu2004}-ansible:latest"
     command: ${MOLECULE_DOCKER_COMMAND:-""}
     cgroupns_mode: host

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -1,4 +1,9 @@
 ---
+- name: Configure elastic repository
+  ansible.builtin.include_role:
+    name: nephelaiio.elastic_repo
+  when: heartbeat_repo_manage
+
 - name: Collect package facts
   ansible.builtin.package_facts:
     manager: auto
@@ -75,8 +80,5 @@
       notify: heartbeat_restart
       when: heartbeat_conf_manage
 
-    - name: Manage heartbeat services
-      ansible.builtin.service:
-        name: "{{ heartbeat_service_name }}"
-        state: "{{ heartbeat_service_status }}"
-        enabled: "{{ heartbeat_service_enabled }}"
+    - name: Include service tasks
+      ansible.builtin.include_tasks: service.yml
diff --git a/tasks/service.yml b/tasks/service.yml
@@ -0,0 +1,6 @@
+---
+- name: Manage heartbeat services
+  ansible.builtin.service:
+    name: "{{ heartbeat_service_name }}"
+    state: "{{ heartbeat_service_status }}"
+    enabled: "{{ heartbeat_service_enabled }}"