Merge branch 'master' into aks_dev

amanr032 · Sep 29, 2020 · cba0e15 · cba0e15
2 parents 072890c + 0db0be9
commit cba0e15
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/ansible/roles/cleaner/scenarios/delfin.yml b/ansible/roles/cleaner/scenarios/delfin.yml
@@ -14,7 +14,7 @@
 
 ---
 - name: Get running delfin processes
-  shell: "ps -ef | grep -v grep | grep -i 'python3 /opt/delfin-linux-amd64/delfin/cmd/' | awk '{print $2}'"
+  shell: "ps -ef | grep -v grep | grep -i 'python3 /opt/delfin-linux-amd64/delfin/' | awk '{print $2}'"
   register: running_processes
 
 - name: Kill running delfin processes

diff --git a/ansible/roles/delfin-installer/scenarios/source-code.yml b/ansible/roles/delfin-installer/scenarios/source-code.yml
@@ -73,6 +73,16 @@
     - delfin.conf
     - api-paste.ini
 
+
+- name: copy scheduler configs to host
+  copy:
+    src: "{{ delfin_work_dir }}/etc/{{ item }}"
+    dest: "{{ delfin_config_dir }}/{{ item }}"
+    mode: 0755
+  become: yes
+  with_items:
+    - scheduler_config.json
+
 - name: Update redis ip & port configuration
   ini_file:
     create: no

diff --git a/ansible/roles/delfin-installer/scenarios/start-delfin.yml b/ansible/roles/delfin-installer/scenarios/start-delfin.yml
@@ -58,5 +58,6 @@
     - '{{ venv }}/exec {{ delfin_work_dir }}/delfin/cmd/api.py --config-file {{ delfin_config_dir }}/delfin.conf  >/tmp/api.log 2>&1 &'
     - '{{ venv }}/exec {{ delfin_work_dir }}/delfin/cmd/task.py --config-file {{ delfin_config_dir }}/delfin.conf  >/tmp/task.log 2>&1 &'
     - '{{ venv }}/exec {{ delfin_work_dir }}/delfin/cmd/alert.py --config-file {{ delfin_config_dir }}/delfin.conf  >/tmp/alert.log 2>&1 &'
+    - '{{ venv }}/exec {{ delfin_work_dir }}/delfin/exporter/exporter_server.py --config-file {{ delfin_config_dir }}/delfin.conf  >/tmp/exporter.log 2>&1 &'
   args:
     chdir: "{{ delfin_work_dir }}"