Using proper default now...
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 718306a..ef199ed 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -2,7 +2,8 @@
###
# Script requirments:
-apt-get install -y python-yaml virtualenv git
+#apt-get install -y python-yaml virtualenv git
+which virtualenv &> /dev/null || apt-get install -y virtualenv
set -e
[ -n "$DEBUG" ] && set -x
diff --git a/watchdog/map.jinja b/watchdog/map.jinja
index 26b8f90..1699eb1 100644
--- a/watchdog/map.jinja
+++ b/watchdog/map.jinja
@@ -11,4 +11,10 @@
'parameter': {}
}
},
+ 'default': {
+ 'module': 'softdog',
+ 'kernel': {
+ 'parameter': {}
+ }
+ },
}, grain='manufacturer', merge=salt['pillar.get']('watchdog:server')) %}
diff --git a/watchdog/server.sls b/watchdog/server.sls
index 2aaef86..b831ba6 100644
--- a/watchdog/server.sls
+++ b/watchdog/server.sls
@@ -9,7 +9,7 @@
file.replace:
- name: /etc/default/watchdog
- pattern: ^watchdog_module=.*
- - repl: watchdog_module="{{ server.module | default('softdog') }}"
+ - repl: watchdog_module="{{ server.module }}"
- require:
- pkg: watchdog_packages
- require_in: watchdog_service
@@ -17,7 +17,7 @@
{%- if server.kernel.parameter is defined %}
/etc/modprobe.d/kernel_module.conf:
file.managed:
- - name: /etc/modprobe.d/{{ server.module | default('softdog') }}.conf
+ - name: /etc/modprobe.d/{{ server.module }}.conf
- template: jinja
- source: salt://watchdog/files/kernel_module.conf
- makedirs: True