Merge "Closes-Bug: #1470628 Server Manager: Use puppet labs reboot in…

…stead of reboot command" into R2.22-dev
Juniper · Sep 5, 2015 · 0e357f9 · 0e357f9
2 parents f7dd0d4 + cec03b4
commit 0e357f9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/contrail/environment/modules/contrail/manifests/lib/upgrade_kernel.pp b/contrail/environment/modules/contrail/manifests/lib/upgrade_kernel.pp
@@ -32,7 +32,7 @@
               apply => "immediately",
               timeout => 0,
               message => "Rebooting for kernel upgrade",
-              subscribe       => Package[$image_extra],
+              subscribe       => [Package[$image_extra], Package[$headers], Package[$headers_generic], Package[$image]],
             }
         } else {
             if ($contrail_kernel_version == "" ) {
@@ -55,7 +55,7 @@
             package { $image : ensure => present, notify => Reboot["after"], }
             ->
             reboot { 'after':
-              subscribe       => Package[$image],
+              subscribe       => [Package[$image_extra], Package[$headers], Package[$headers_generic], Package[$image]],
               apply => "immediately",
               message => "Rebooting for kernel upgrade",
               timeout => 0,