From 47e2d0e91ef17d0898465b2ad7cbb87d7c1ce28d Mon Sep 17 00:00:00 2001 From: keshavprasadms <keshavprasadms@gmail.com> Date: Wed, 11 May 2022 13:42:07 +0530 Subject: [PATCH] fix: install packages for ubuntu 20 and above --- ansible/bootstrap.yml | 6 ++++++ .../postgresql-data-update-managed/tasks/main.yml | 11 +++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ansible/bootstrap.yml b/ansible/bootstrap.yml index 7d8c99480..384c6f69f 100644 --- a/ansible/bootstrap.yml +++ b/ansible/bootstrap.yml @@ -6,10 +6,16 @@ pre_tasks: - name: Python predependency raw: bash -c "test -e /usr/bin/python" || (sudo apt update && sudo apt install -y python) + - name: Installing other packages + apt: + state: present + name: ['python-pkg-resources', 'python2-pip'] + when: ansible_distribution_version | float < 20 - name: Installing other packages apt: state: present name: ['python-pkg-resources', 'python3-pip', 'acl'] + when: ansible_distribution_version | float > 20 roles: - bootstrap_any tags: diff --git a/ansible/roles/postgresql-data-update-managed/tasks/main.yml b/ansible/roles/postgresql-data-update-managed/tasks/main.yml index 6be382083..39d17807f 100644 --- a/ansible/roles/postgresql-data-update-managed/tasks/main.yml +++ b/ansible/roles/postgresql-data-update-managed/tasks/main.yml @@ -1,7 +1,14 @@ -- name: install psycopg2 +- name: install python-psycopg2 package: name: python-psycopg2 state: present + when: ansible_distribution_version | float < 20 + +- name: install python3-psycopg2 + package: + name: python3-psycopg2 + state: present + when: ansible_distribution_version | float > 20 - name: Verifying db users are present else creating them include: databases.yml @@ -58,4 +65,4 @@ login_host: "{{ uci_postgres_host }}" name: "{{ uci_odk_postgres_database }}" state: restore - target: "/tmp/uci_odk_postgres.sql" \ No newline at end of file + target: "/tmp/uci_odk_postgres.sql" -- GitLab