Fix postgresql

[tigpas]

In icinga2/postgresql-server.sls, there is icinga2.icinga_web2.postgresql_pkgs used, but the icinga2 variable isn't available. Due the include of map.jinja, it works. Than, we can use the "use_formula" variable from map, and not direct from pillar.

[myii]

@tigpas Thanks for this series of PRs. In order to evaluate these changes, I'm about to implement semantic-release for this formula, so that we have automated testing running as well. I'm almost done:

• https://travis-ci.org/myii/icinga2-formula/builds/622884689

As soon as that's merged, please rebase your PRs on top and then we can see how your changes work out.

[myii]

@tigpas FYI, the semantic-release PR is ready: #37.

[tigpas]

Hi,

thanks for the great testing environment and for #37 .

Yes, I broke the if case in line 3. I reverted it.

Now, It's working with

diff --git a/test/salt/pillar/default.sls b/test/salt/pillar/default.sls
index 8b60d60..8c14efe 100644
--- a/test/salt/pillar/default.sls
+++ b/test/salt/pillar/default.sls
@@ -36,7 +36,7 @@ icinga2:
         ca_file: /etc/ssl/certs/ca-certificates.crt

   postgres:
-    use_formula: true  # set to true if you are using postgres-formula
+    use_formula: false # set to true if you are using postgres-formula

   nrpe:  # deprecated
     config:

as expected. But I don't understand why https://travis-ci.com/saltstack-formulas/icinga2-formula/jobs/267062799 failed. I can reproduce it locally with the master branche, too.

[myii]

@tigpas Thanks for updating this. I've run this with a modified test pillar to confirm it is all working OK:

• https://travis-ci.org/myii/icinga2-formula/builds/625334722

As for the debian-10 failure, there's something getting messed up at the Travis layer because it's working fine locally (CC: @javierbertoli).

I'm thinking that we can adjust the test suites slightly to test both with and without the postgres-formula but I'll leave that for a subsequent PR. I've merged this in the meantime. Thanks for the contribution!

[saltstack-formulas-travis]

:tada: This PR is included in version 0.9.0 :tada:

The release is available on GitHub release

Your semantic-release bot :package::rocket: