Adding default False values instead of empty ones
If docker.proxy.enabled (for example) is not defined, docker state fails
setting default values seems to 'if' conditions would fix the issue
Change-Id: I8c9c09d6a43747cb9d4fd395dbc596989d620349
diff --git a/docker/client/init.sls b/docker/client/init.sls
index 8e0ca58..6ad6ba0 100644
--- a/docker/client/init.sls
+++ b/docker/client/init.sls
@@ -1,5 +1,5 @@
{% from "docker/map.jinja" import client with context %}
-{%- if client.get('enabled') %}
+{%- if client.get('enabled', False) %}
include:
{%- if client.network is defined %}
diff --git a/docker/host.sls b/docker/host.sls
index 3a6d1d4..816b0c4 100644
--- a/docker/host.sls
+++ b/docker/host.sls
@@ -38,7 +38,7 @@
- watch_in:
- service: docker_service
-{%- if host.get('proxy', {}).get('enabled') %}
+{%- if host.get('proxy', {}).get('enabled', False) %}
{%- if host.proxy.get('http') or host.proxy.get('https') or host.proxy.get('no_proxy') %}
/etc/systemd/system/docker.service.d/http-proxy.conf:
diff --git a/docker/meta/collectd.yml b/docker/meta/collectd.yml
index b5e9183..4a5a791 100644
--- a/docker/meta/collectd.yml
+++ b/docker/meta/collectd.yml
@@ -1,6 +1,6 @@
{% from "docker/map.jinja" import host with context %}
-{%- if host.get('enabled') %}
+{%- if host.get('enabled', False) %}
local_plugin:
collectd_docker:
plugin: python
diff --git a/docker/meta/heka.yml b/docker/meta/heka.yml
index 4a7baec..dff541b 100644
--- a/docker/meta/heka.yml
+++ b/docker/meta/heka.yml
@@ -1,6 +1,6 @@
{% from "docker/map.jinja" import host with context %}
-{%- if host.get('enabled') %}
+{%- if host.get('enabled', False) %}
metric_collector:
trigger:
docker-local-check:
diff --git a/docker/meta/prometheus.yml b/docker/meta/prometheus.yml
index 6e53766..2d4d7bb 100644
--- a/docker/meta/prometheus.yml
+++ b/docker/meta/prometheus.yml
@@ -2,7 +2,7 @@
server:
alert:
-{%- if host.get('enabled') %}
+{%- if host.get('enabled', False) %}
DockerdProcessDown:
if: >-
procstat_running{process_name="dockerd"} == 0
@@ -15,7 +15,7 @@
description: 'Dockerd service is down on node {{ $labels.host }}'
{%- endraw %}
{%- endif %}
-{%- if client.get('enabled') %}
+{%- if client.get('enabled', False) %}
{%- for stack_name, stack in client.get('stack', {})|dictsort %}
{%- for service_name, service in stack.get('service', {})|dictsort %}
{%- if service.get('deploy', {}).replicas is defined %}