From 47d9a86b47d81cccf0e50e16523bdaec244384dc Mon Sep 17 00:00:00 2001 From: Marco Braga Date: Fri, 14 Aug 2020 17:34:42 -0300 Subject: [PATCH 1/2] fix/installer: supporting installer on Ubuntu 20 --- tasks/main.yml | 13 +++++++++++-- vars/main.yml | 11 ++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 664b087..f9b0544 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -14,6 +14,13 @@ dest: "{{ omsagent_tmp }}" mode: "750" +- name: Correct python version selected + alternatives: + link: /usr/bin/python + name: python + path: "{{ discovered_interpreter_python }}" + priority: 0 + - name: ensure directory exist file: path: /etc/opt/microsoft/omsagent @@ -32,9 +39,9 @@ - name: run script (can take a couple of minutes) command: "{{ omsagent_tmp }}/onboard_agent.sh" + register: shell_res args: - creates: omsagent-{{ omsagent_version }}.universal.{{ omsagent_creates_pattern }}.sh - chdir: "{{ omsagent_tmp }}" + creates: /opt/omi/bin/omiserver - name: wait for omid to start from script pause: @@ -47,3 +54,5 @@ enabled: yes when: - omsagent_service_state | length + +- debug: msg="{{ omsagent_tmp }}/omsagent-{{ omsagent_version }}.universal.{{ omsagent_creates_pattern }}.sh" diff --git a/vars/main.yml b/vars/main.yml index 7566eeb..0b6453f 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -2,12 +2,17 @@ # vars file for omsagent _omsagent_requirements: - default: + Debian: + - linux-libc-dev + - python3-libtiff + - libpam-modules + RedHat: - glibc - - openssl - - curl - python-ctypes - pam + default: + - openssl + - curl - wget - which From 8e552996cfc8a67bf38baf8d033adfab4fb61db7 Mon Sep 17 00:00:00 2001 From: Marco Braga Date: Fri, 14 Aug 2020 17:50:44 -0300 Subject: [PATCH 2/2] fix/installer: supporting installer on Ubuntu 20 --- tasks/main.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index f9b0544..6a7ae8e 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -54,5 +54,3 @@ enabled: yes when: - omsagent_service_state | length - -- debug: msg="{{ omsagent_tmp }}/omsagent-{{ omsagent_version }}.universal.{{ omsagent_creates_pattern }}.sh"