Merge pull request #138 from m0duspwnens/master

Fixed bugs with motd update from OS patch updates

salt/_modules/needs_restarting.py

@@ -4,20 +4,19 @@ import subprocess
 def check():
 
   os = __grains__['os']
+  retval = 'False'
 
   if os == 'Ubuntu':
     if path.exists('/var/run/reboot-required'):
       retval = 'True'
-    else:
-      retval = 'False'
 
   elif os == 'CentOS':
     cmd = 'needs-restarting -r > /dev/null 2>&1'
+    
     try:
-      needs_restarting = subprocess.check_call(cmd.split(), shell=True)
+      needs_restarting = subprocess.check_call(cmd, shell=True)
     except subprocess.CalledProcessError:
       retval = 'True'
-    retval = 'False'
 
   else:
     retval = 'Unsupported OS: %s' % os

salt/motd/init.sls

@@ -1,5 +1,5 @@
 package_update_reboot_required_motd:
-  file.append:
+  file.managed:
     - name: /etc/motd
     - source: salt://motd/files/package_update_reboot_required.jinja
     - template: jinja

salt/patch/needs_restarting.sls

@@ -0,0 +1,5 @@
+needs_restarting:
+  module.run:
+    - mine.send:
+      - func: needs_restarting.check
+    - order: last

salt/patch/os/init.sls

@@ -1,5 +1,6 @@
-{% if grains.os == "CentOS" %}
 include:
+  - patch.needs_restarting
+{% if grains.os == "CentOS" %}
   - yum.packages
 {% endif %}
 
@@ -7,8 +8,3 @@ patch_os:
   pkg.uptodate:
     - name: patch_os
     - refresh: True
-
-needs_restarting:
-  module.run:
-    - mine.send:
-      - func: needs_restarting.check

salt/top.sls

@@ -7,6 +7,7 @@
 base:
   '*':
     - patch.os.schedule
+    - patch.needs_restarting
     - motd
 
   'G@role:so-sensor':