diff --git a/defaults/main.yml b/defaults/main.yml index 0417cc9..5ff7208 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,5 +1,7 @@ --- # defaults file for datasaker +datasaker_host_path: /etc/datasaker +datasaker_host_log_path: /var/log/datasaker datagate_trace_url: gate.kr.datasaker.io datagate_trace_port: 31300 @@ -70,4 +72,4 @@ postgres_agent_log_level: "INFO" plan_postgres_agent_log_level: "INFO" uninstall: False -datasaker_clean: False \ No newline at end of file +datasaker_clean: False diff --git a/tasks/dsk-common.yml b/tasks/dsk-common.yml index 1c5a6a1..251228d 100644 --- a/tasks/dsk-common.yml +++ b/tasks/dsk-common.yml @@ -7,15 +7,20 @@ owner: root group: root with_items: - - /etc/datasaker + - "{{ datasaker_host_path }}" when: - ansible_facts.os_family in ["Debian", "RedHat"] - datasaker_agents +- name: "create global-config" + ansible.builtin.file: + path: "{{ datasaker_host_path }}/global-config.yml" + state: touch + - name: "Setting global-config" template: src: global-config.yml.j2 - dest: "/etc/datasaker/global-config.yml" + dest: "{{ datasaker_host_path }}"/global-config.yml" when: - ansible_facts.os_family in ["Debian", "RedHat"] - datasaker_agents @@ -42,4 +47,5 @@ src: global-config.yml.j2 dest: "{{ datasaker_docker_global_config }}" when: - - datasaker_docker_agents \ No newline at end of file + - datasaker_docker_agents + diff --git a/tasks/dsk-debian-pkg.yml b/tasks/dsk-debian-pkg.yml index eb595c1..40a48fb 100644 --- a/tasks/dsk-debian-pkg.yml +++ b/tasks/dsk-debian-pkg.yml @@ -1,9 +1,4 @@ --- -- name: "Setting global-config" - template: - src: global-config.yml.j2 - dest: "/etc/datasaker/global-config.yml" - - set_fact: datasaker_agents: "{{ datasaker_agents | reject('equalto', 'dsk-log-agent') | list }}" when: ansible_facts.distribution_version != "18.04" @@ -60,7 +55,7 @@ - name: Make Datasaker Log Directory ansible.builtin.file: - path: "/var/log/datasaker/{{ item }}" + path: "{{ datasaker_host_log_path }}/{{ item }}" state: directory recurse: yes owner: root @@ -95,4 +90,4 @@ state: restarted with_items: - "{{ datasaker_agents }}" - ignore_errors: true \ No newline at end of file + ignore_errors: true diff --git a/tasks/main.yml b/tasks/main.yml index 3813ff5..a1ead5c 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -33,6 +33,7 @@ include_tasks: check-agent.yml when: - uninstall == False + - datasaker_docker_agents - name: "Include Docker Agent Path Permissions Setting" include_tasks: permissions.yml @@ -43,4 +44,4 @@ - name: "Uninstall Datasaker Agent" include_tasks: remove-datasaker.yml when: - - uninstall == True \ No newline at end of file + - uninstall == True diff --git a/tasks/vi b/tasks/vi new file mode 100644 index 0000000..a778fa9 --- /dev/null +++ b/tasks/vi @@ -0,0 +1,43 @@ +--- +- name: "Add datasaker repository" + yum_repository: + name: datasaker + description: datasaker-repo + baseurl: "{{ datasaker_yum_repo }}" + enabled: "{{ datasaker_yum_enabled }}" + gpgcheck: "{{ datasaker_yum_gpgcheck }}" + +- set_fact: + datasaker_agents: "{{ datasaker_agents | reject('equalto', 'dsk-log-agent') | list }}" + +- name: "Check datasaker Agent" + include_tasks: check-agent.yml + +- name: Make Datasaker Log Directory + ansible.builtin.file: + path: "{{ datasaker_host_log_path }}/{{ item }}" + state: directory + recurse: yes + owner: root + group: root + with_items: + - "{{ datasaker_agents }}" + +- name: "Install datasaker log agent" + apt: + name: "td-agent" + state: latest + update_cache: yes + when: '"dsk-log-agent" in datasaker_agents' + +- name: "Install datasaker agent" + yum: + name: "{{ item }}" + state: present + update_cache: yes + with_items: + - "{{ datasaker_agents }}" + notify: + - Reload systemd configuration + - Restart {{ item }} service + ignore_errors: true