Use defaults in map.jinja.
diff --git a/docker/host.sls b/docker/host.sls
index 1799e7a..2deaf38 100644
--- a/docker/host.sls
+++ b/docker/host.sls
@@ -31,7 +31,7 @@
- require:
- pkg: docker_packages
-{% if host.install_docker_py is defined and host.install_docker_py %}
+{% if host.install_docker_py %}
docker-py-requirements:
pkg.installed:
- name: python-pip
diff --git a/docker/map.jinja b/docker/map.jinja
index 7e4e7a5..9511e0f 100644
--- a/docker/map.jinja
+++ b/docker/map.jinja
@@ -2,19 +2,27 @@
{% set host = salt['grains.filter_by']({
'CentOS': {
'pkgs': ['docker-io'],
- 'service': 'docker'
+ 'service': 'docker',
+ 'container': {},
+ 'install_docker_py': False
},
'Debian': {
'pkgs': ['docker.io'],
- 'service': 'docker'
+ 'service': 'docker',
+ 'container': {},
+ 'install_docker_py': False
},
'RedHat': {
'pkgs': ['iptables', 'lxc-docker'],
- 'service': 'docker'
+ 'service': 'docker',
+ 'container': {},
+ 'install_docker_py': False
},
'Ubuntu': {
'pkgs': ['docker-engine'],
- 'service': 'docker'
+ 'service': 'docker',
+ 'container': {},
+ 'install_docker_py': False
},
}, grain='os', merge=salt['pillar.get']('docker:host')) %}