Merge pull request #150 from ghormoon/pgsql-dont-create-db-and-user-with-schema

fix(pgsql): do not try to create db and user with schema

Author: hatifnatt

docs/README.rst

@@ -197,15 +197,20 @@ Creates database and mysql user for Zabbix.
 
 Creates mysql schema for Zabbix.
 
+``zabbix.pgsql.pkgs``
+^^^^^^^^^^^^^^^^^^^^^^^
+
+Install required psql packages.
+
 ``zabbix.pgsql.conf``
 ^^^^^^^^^^^^^^^^^^^^^
 
-Creates database and PostgreSQL user for Zabbix.
+Creates database and PostgreSQL user for Zabbix. Includes zabbix.pgsql.pkgs.
 
 ``zabbix.pgsql.schema``
 ^^^^^^^^^^^^^^^^^^^^^^^
 
-Creates PostgreSQL schema for Zabbix.
+Creates PostgreSQL schema for Zabbix. Includes zabbix.pgsql.pkgs.
 
 ``zabbix.proxy``
 ^^^^^^^^^^^^^^^^

zabbix/pgsql/conf.sls

@@ -10,36 +10,8 @@
 {% set dbroot_user = settings.get('dbroot_user') -%}
 {% set dbroot_pass = settings.get('dbroot_pass') -%}
 
-# Install packages required for Salt postgres module
-{% if settings.get('pkgs', defaults.get('pkgs', False))
-      and not settings.get('skip_pkgs', defaults.skip_pkgs) -%}
-pgsql_packages:
-  pkg.installed:
-    - pkgs: {{ settings.get('pkgs', defaults.pkgs)|json }}
-{% elif settings.get('skip_pkgs', defaults.skip_pkgs) -%}
-pgsql_packages:
-  test.configurable_test_state:
-    - name: You skipped installation of packages required for Salt postgres module.
-    - changes: False
-    - result: True
-{% else -%}
-pgsql_packages:
-  test.configurable_test_state:
-    - name: Packages required for Salt postgres module are not defined
-    - changes: False
-    - result: False
-    - comment: |
-        Additional packages are required to manage the PostgreSQL database.
-        Please specify them in pillar as list.
-        Tip: you need postgresql-client packages, like:
-        zabbix-pgsql:
-          pkgs:
-            - postgresql-client-common
-            - postgresql-client
-        Or you can skip installing them, but formula likely fail without them.
-        zabbix-pgsql:
-          skip_pkgs: True
-{% endif -%}
+include:
+  - zabbix.pgsql.pkgs
 
 zabbix_pgsql_user:
   postgres_user.present:

zabbix/pgsql/pkgs.sls

@@ -0,0 +1,34 @@
+{% from "zabbix/map.jinja" import zabbix with context -%}
+{% set settings = salt['pillar.get']('zabbix-pgsql', {}) -%}
+{% set defaults = zabbix.get('pgsql', {}) -%}
+
+# Install packages required for Salt postgres module
+{% if settings.get('pkgs', defaults.get('pkgs', False))
+      and not settings.get('skip_pkgs', defaults.skip_pkgs) -%}
+pgsql_packages:
+  pkg.installed:
+    - pkgs: {{ settings.get('pkgs', defaults.pkgs)|json }}
+{% elif settings.get('skip_pkgs', defaults.skip_pkgs) -%}
+pgsql_packages:
+  test.configurable_test_state:
+    - name: You skipped installation of packages required for Salt postgres module.
+    - changes: False
+    - result: True
+{% else -%}
+pgsql_packages:
+  test.configurable_test_state:
+    - name: Packages required for Salt postgres module are not defined
+    - changes: False
+    - result: False
+    - comment: |
+        Additional packages are required to manage the PostgreSQL database.
+        Please specify them in pillar as list.
+        Tip: you need postgresql-client packages, like:
+        zabbix-pgsql:
+          pkgs:
+            - postgresql-client-common
+            - postgresql-client
+        Or you can skip installing them, but formula likely fail without them.
+        zabbix-pgsql:
+          skip_pkgs: True
+{% endif -%}

zabbix/pgsql/schema.sls

@@ -28,7 +28,7 @@
 {% endif -%}
 
 include:
-  - zabbix.pgsql.conf
+  - zabbix.pgsql.pkgs
 
 check_db_pgsql:
   test.configurable_test_state: