commit 445d77117fd11f94e1ec34741e36cd64e8e49f3d
author Petr Ruzicka <petr.ruzicka@gmail.com> Thu Feb 08 12:12:18 2018 +0100
committer Petr Ruzicka <petr.ruzicka@gmail.com> Thu Feb 08 13:36:44 2018 +0100
tree fcb28a13cc0b66f2063117ce203c546ec834bc8c
parent c266d4533e854a045a77d3708a1fa56358b0a066

Kernel module fixed

Change-Id: I9846124d1baeaa9139abc23c6f539941078c7120

tests/pillar/server.sls

diff --git a/tests/pillar/server.sls b/tests/pillar/server.sls
index 0770795..62b28c7 100644
--- a/tests/pillar/server.sls
+++ b/tests/pillar/server.sls
@@ -2,8 +2,7 @@
   server:
     enabled: true
     timeout: 60
-    # These parametrs shoudl create file in /etc/modprobe.d/kernel_module.conf with content "option module soft_panic=1 parameter=second value_only"
+    # These parametrs should create file in /etc/modprobe.d/kernel_module.conf with content "option module soft_panic=1 parameter=second value_only"
     kernel:
       parameter:
         nowayout: 0
-

tests/run_tests.sh

diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 8fe8deb..d2d1221 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -46,10 +46,10 @@
     dependency_check virtualenv
     virtualenv $VENV_DIR
     source ${VENV_DIR}/bin/activate
-    python $(which pip) install salt${PIP_SALT_VERSION}
-    python $(which pip) install jsonschema
+    python -m pip install salt${PIP_SALT_VERSION}
+    python -m pip install jsonschema
     if [[ -f ${CURDIR}/pip_requirements.txt ]]; then
-       python $(which pip) install -r ${CURDIR}/pip_requirements.txt
+       python -m pip install -r ${CURDIR}/pip_requirements.txt
     fi
 }
 
@@ -167,7 +167,7 @@
 lint_releasenotes() {
     [[ ! -f "${VENV_DIR}/bin/activate" ]] && setup_virtualenv
     source ${VENV_DIR}/bin/activate
-    python $(which pip) install reno
+    python -m pip install reno
     reno lint ${CURDIR}/../
 }
 
@@ -209,7 +209,7 @@
       fetch_dependency "salt:https://github.com/salt-formulas/salt-formula-salt"
       link_modules
       # Rendered Example:
-      # salt-call --local -c /test1/maas/tests/build/salt --id=maas_cluster modelschema.model_validate maas cluster
+      # python $(which salt-call) --local -c /test1/maas/tests/build/salt --id=maas_cluster modelschema.model_validate maas cluster
       for role in ${SCHEMARDIR}/*.yaml; do
           state_name=$(basename "${role%*.yaml}")
           minion_id="${state_name}"

watchdog/files/kernel_module.conf

diff --git a/watchdog/files/kernel_module.conf b/watchdog/files/kernel_module.conf
index 0d14fa2..05642c2 100644
--- a/watchdog/files/kernel_module.conf
+++ b/watchdog/files/kernel_module.conf
@@ -1,4 +1,2 @@
 {%- from "watchdog/map.jinja" import server with context -%}
-{%- if server.module is defined -%}
 option {{ server.module }}{% for (parameter, value) in server.kernel.parameter.items() %} {{ parameter }}{%if value %}={{ value }}{% endif %}{% endfor %}
-{%- endif %}

watchdog/server.sls

diff --git a/watchdog/server.sls b/watchdog/server.sls
index b831ba6..1e83deb 100644
--- a/watchdog/server.sls
+++ b/watchdog/server.sls
@@ -14,7 +14,7 @@
       - pkg: watchdog_packages
     - require_in: watchdog_service
 
-{%- if server.kernel.parameter is defined %}
+{%- if server.kernel.parameter is defined and server.kernel.parameter %}
 /etc/modprobe.d/kernel_module.conf:
   file.managed:
     - name: /etc/modprobe.d/{{ server.module }}.conf