Gerrit prevent yaml from failing
When including /meta/salt.yml from outside of this
formula the yaml can fail if appropriate pillar elements are not
found. Changing syntax to eliminate this. Including the file
above is needed for generating minion orchestration config
for future use with salt orchestration methods
Change-Id: Iaef79302086b6152708bb272d101f45d8e4972c9
Related-PROD: PROD-19973
diff --git a/gerrit/map.jinja b/gerrit/map.jinja
index 5b38af4..c3ed4ab 100644
--- a/gerrit/map.jinja
+++ b/gerrit/map.jinja
@@ -14,7 +14,7 @@
{%- set server = salt['grains.filter_by'](server_defaults, merge=salt['pillar.get']('gerrit:server')) %}
{%- load_yaml as client_defaults %}
-{% set project_config = pillar.gerrit.get('client', {}).get('dir', {}).get('project_config', '/srv/jeepyb') %}
+{% set project_config = pillar.get('gerrit', {}).get('client', {}).get('dir', {}).get('project_config', '/srv/jeepyb') %}
Debian:
homepage: "http://domain.com/"
source:
diff --git a/gerrit/meta/salt.yml b/gerrit/meta/salt.yml
index 14c981f..d0e541a 100644
--- a/gerrit/meta/salt.yml
+++ b/gerrit/meta/salt.yml
@@ -21,7 +21,7 @@
{%- endif %}
dependency:
{% from "gerrit/map.jinja" import client with context %}
- {%- if client.enabled %}
+ {%- if client.get('enabled', False) %}
{%- if client.source.engine == 'pkg' %}
engine: pkg
pkgs: {{ client.source.pkgs_salt }}