Fix setting custom Grafana certificates and Prometheus CLI flags

[p-se]

Signed-off-by: Patrick Seidensal pseidensal@suse.com

Fixes issues in using pillar values for setting custom Grafana certificates and providing additional command line flags for Prometheus (to increase retention time, for instance).

The template inside these conditions has probably never worked, as it cannot be compiled. The conditional code is only compiled if the pillar values are specified, so it didn't reveal an issue if those features weren't used, which seems to have always been the case.

---

Checklist:

• [ ] Added unittests and or functional tests
• [ ] Adapted documentation
• [x] Referenced issues or internal bugtracker
• [ ] Ran integration tests successfully (trigger with "@susebot run teuthology" in a GitHub comment; see the wiki for more information)

[smithfarm]

@susebot run teuthology

[susebot]

Commit 690ab5524a8e44fb6436f8ed2e287b96e61a2116 is NOT OK for suite deepsea:tier2. Check tests results in the Jenkins job: https://storage-ci.suse.de/job/pr-deepsea/491/

[smithfarm]

@susebot run teuthology

[susebot]

Commit 690ab5524a8e44fb6436f8ed2e287b96e61a2116 is OK for suite deepsea:tier2. Check tests results in the Jenkins job: https://storage-ci.suse.de/job/pr-deepsea/492/

[smithfarm]

@tserong It is my understanding that this PR fixes https://bugzilla.suse.com/show_bug.cgi?id=1179581

Therefore, I have added it to https://confluence.suse.com/display/SUSEEnterpriseStorage/SES6+DeepSea+Maintenance+Updates

It passed susebot run teuthology - shall we go ahead and merge it now so it makes it into 0.9.34? (It is already circulating as a PTF.)