template 추가

tasks/dsk-debian-pkg.yml

@@ -1,26 +1,4 @@
 ---
-# - name: test
-#   debug:
-#     msg: "{{ item }}"
-#   with_items:
-#     - "{{ datagate_trace_url }}"
-#     - "{{ datagate_trace_port }}"
-#     - "{{ datagate_trace_timeout }}"
-#     - "{{ datagate_manifes_url }}"
-#     - "{{ datagate_manifest_port }}"
-#     - "{{ datagate_manifest_timeout }}"
-#     - "{{ datagate_metric_url }}"
-#     - "{{ datagate_metric_port }}"
-#     - "{{ datagate_metric_timeout }}"
-#     - "{{ datagate_plan_url }}"
-#     - "{{ datagate_plan_port }}"
-#     - "{{ datagate_plan_timeout }}"
-#     - "{{ datagate_loggate_url }}"
-#     - "{{ datagate_loggate_port }}"
-#     - "{{ datagate_loggate_timeout }}"
-#     - "{{ datasaker_api_url }}"
-#     - "{{ datasaker_api_send_interval }}"
-
 - name: "Setting global-config"
   template:
     src: global-config.yml.j2
@@ -38,7 +16,7 @@
     dest: "{{ tempdir.path }}/datasaker.gpg.key"
     force: yes
 
-- name: "Ensure downloaded file for {{ key_fingerprint }} is a binary keyring"
+- name: "Ensure downloaded file for binary keyring"
   shell: "cat {{ tempdir.path }}/datasaker.gpg.key | sudo gpg --import --batch --no-default-keyring --keyring {{ apt_usr_share_keyring }}"
 
 - name: "copy keyring to trusted keyring"
@@ -53,19 +31,16 @@
     path: "{{ tempdir.path }}"
     state: absent
 
-      #- name: Import datasaker GPG key
-      #  apt_key:
-      #    url: https://dsk-agent-s3.s3.ap-northeast-2.amazonaws.com/dsk-agent-s3/public/public.gpg.key
-      #    state: present
-      #  become: true
-
-- name: Add datasaker repository
+- name: "Add datasaker repository"
   apt_repository:
     repo: "deb [signed-by={{ apt_usr_share_keyring }}] https://nexus.exem-oss.org/repository/debian-repos/ ubuntu main"
     state: present
     filename: datasaker.list
 
-- name: Install required packages
+- name: "Check datasaker Agent"
+  include_tasks: check-agent.yml
+
+- name: "Install datasaker agent"
   apt:
     name: "{{ item }}"
     state: present
@@ -74,3 +49,12 @@
     - "{{ datasaker_agents }}"
   notify:
     - Restart {{ item }} service
+
+# - name: "Ensure datasaker agent is running"
+#   service:
+#     name: "{{ item }}"
+#     state: started
+#     enabled: yes
+#   with_items:
+#     - "{{ datasaker_agents }}"    
+