Merge pull request #149 from kr4ut/python

Install Python bindings based on interpreter; Closes #148
dj-wasabi · Aug 4, 2019 · 6cba608 · 6cba608
2 parents 25c3059 + 35f3663
commit 6cba608
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 39 deletions.
diff --git a/tasks/Debian.yml b/tasks/Debian.yml
@@ -10,6 +10,7 @@
       - "http://repo.zabbix.com/zabbix/{{ zabbix_version }}/{{ ansible_distribution.lower() }}/"
       - "{{ ansible_distribution_release }}"
       - "main"
+    zabbix_python_prefix: "python{% if ansible_python_version | version_compare('3', '>=') %}3{% endif %}"
 
 - name: "Debian | Set some facts"
   set_fact:
@@ -96,7 +97,7 @@
 
 - name: "Debian | Install Ansible module dependencies"
   apt:
-    name: python-psycopg2
+    name: "{{ zabbix_python_prefix }}-psycopg2"
     state: present
   register: zabbix_server_dependencies_installed
   until: zabbix_server_dependencies_installed is succeeded
@@ -110,7 +111,7 @@
   apt:
     name:
       - mysql-client
-      - python-mysqldb
+      - "{{ zabbix_python_prefix }}-mysqldb"
     state: present
   register: zabbix_server_dependencies_installed
   until: zabbix_server_dependencies_installed is succeeded

diff --git a/tasks/postgresql.yml b/tasks/postgresql.yml
@@ -1,39 +1,6 @@
 ---
 # task file for postgresql
 
-- name: "Set facts for usage in this playbook"
-  set_fact:
-    postgres_create_command:
-      - "cd {{ datafiles_path }} &&"
-      - "if [ -f create.sql.gz ]; then gunzip create.sql.gz ; fi &&"
-      - "psql -h '{{ zabbix_server_dbhost }}'"
-      - "-U '{{ zabbix_server_dbuser }}'"
-      - "-d '{{ zabbix_server_dbname }}'"
-      - "-p '{{ zabbix_server_dbport }}'"
-      - "-f create.sql && touch /etc/zabbix/schema.done"
-    postgres_schema_command:
-      - "cd {{ datafiles_path }} && "
-      - "if [ -f schema.sql.gz ]; then gunzip schema.sql.gz ; fi &&"
-      - "psql -h '{{ zabbix_server_dbhost }}'"
-      - "-U '{{ zabbix_server_dbuser }}'"
-      - "-d '{{ zabbix_server_dbname }}'"
-      - "-p '{{ zabbix_server_dbport }}'"
-      - "-f schema.sql && touch /etc/zabbix/schema.done"
-    postgres_images_command:
-      - "cd {{ datafiles_path }} &&"
-      - "psql -h '{{ zabbix_server_dbhost }}'"
-      - "-U '{{ zabbix_server_dbuser }}'"
-      - "-d '{{ zabbix_server_dbname }}'"
-      - "-p '{{ zabbix_server_dbport }}'"
-      - "-f images.sql && touch /etc/zabbix/images.done"
-    postgres_data_command:
-      - "cd {{ datafiles_path }} &&"
-      - "psql -h '{{ zabbix_server_dbhost }}'"
-      - "-U '{{ zabbix_server_dbuser }}'"
-      - "-d '{{ zabbix_server_dbname }}'"
-      - "-p '{{ zabbix_server_dbport }}'"
-      - "-f data.sql && touch /etc/zabbix/data.done"
-
 - name: "Set the correct delegated_dbhost (to support postgres db deployment on a remote dbhost)"
   set_fact:
     delegated_dbhost: "{{ zabbix_server_dbhost if (zabbix_server_dbhost != 'localhost') else inventory_hostname }}"
@@ -95,7 +62,14 @@
     - database
 
 - name: "PostgreSQL | Create schema"
-  shell: "{{ postgres_create_command | join(' ') }}"
+  shell: >
+    cd {{ datafiles_path }} &&
+    if [ -f create.sql.gz ]; then gunzip create.sql.gz ; fi &&
+    psql -h '{{ zabbix_server_dbhost }}'
+    -U '{{ zabbix_server_dbuser }}'
+    -d '{{ zabbix_server_dbname }}'
+    -p '{{ zabbix_server_dbport }}'
+    -f create.sql && touch /etc/zabbix/schema.done
   args:
     creates: /etc/zabbix/schema.done
     warn: no
@@ -133,7 +107,14 @@
     - create_dir_or_not.stat.exists
 
 - name: "PostgreSQL | Importing schema file"
-  shell: "{{ postgres_schema_command | join(' ') }}"
+  shell: >
+    cd {{ datafiles_path }} &&
+    if [ -f schema.sql.gz ]; then gunzip schema.sql.gz ; fi &&
+    psql -h '{{ zabbix_server_dbhost }}'
+    -U '{{ zabbix_server_dbuser }}'
+    -d '{{ zabbix_server_dbname }}'
+    -p '{{ zabbix_server_dbport }}'
+    -f schema.sql && touch /etc/zabbix/schema.done
   args:
     creates: /etc/zabbix/schema.done
     warn: no
@@ -146,7 +127,13 @@
     - database
 
 - name: "PostgreSQL | Importing images file"
-  shell: "{{ postgres_images_command | join(' ') }}"
+  shell: >
+    cd {{ datafiles_path }} &&
+    psql -h '{{ zabbix_server_dbhost }}'
+    -U '{{ zabbix_server_dbuser }}'
+    -d '{{ zabbix_server_dbname }}'
+    -p '{{ zabbix_server_dbport }}'
+    -f images.sql && touch /etc/zabbix/images.done
   args:
     creates: /etc/zabbix/images.done
     warn: no
@@ -158,7 +145,13 @@
     - database
 
 - name: "PostgreSQL | Importing data file"
-  shell: "{{ postgres_data_command | join(' ') }}"
+  shell: >
+    cd {{ datafiles_path }} &&
+    psql -h '{{ zabbix_server_dbhost }}'
+    -U '{{ zabbix_server_dbuser }}'
+    -d '{{ zabbix_server_dbname }}'
+    -p '{{ zabbix_server_dbport }}'
+    -f data.sql && touch /etc/zabbix/data.done
   args:
     creates: /etc/zabbix/data.done
     warn: no