Merge "Partial-Bug: #1566047"

Juniper · Apr 12, 2016 · ab4aac0 · ab4aac0
2 parents 709a68d + 78fa6b6
commit ab4aac0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/contrail/environment/modules/contrail/manifests/compute/install.pp b/contrail/environment/modules/contrail/manifests/compute/install.pp
@@ -58,8 +58,8 @@
                     Package[$vrouter_pkg, 'contrail-openstack-vrouter']
 
                     $vrouter_pkg = 'contrail-vrouter-dpdk-init'
-                } elsif ($::kernelrelease == '3.13.0-40-generic') {
-                    $vrouter_pkg = 'contrail-vrouter-3.13.0-40-generic'
+                } elsif ($::kernelrelease == '3.13.0-83-generic') {
+                    $vrouter_pkg = 'contrail-vrouter-3.13.0-83-generic'
                 } else {
                     $vrouter_pkg = 'contrail-vrouter-dkms'
                 }

diff --git a/contrail/environment/modules/contrail/manifests/params.pp b/contrail/environment/modules/contrail/manifests/params.pp
@@ -796,8 +796,8 @@
        $contrail_dist_kernel_version = $contrail_kernel_version
     } else {
        if ($lsbdistrelease == "14.04") {
-	   $contrail_dist_kernel_version = "3.13.0-40"
-           $contrail_grub_string = 'GRUB_DEFAULT=\'Advanced options for Ubuntu>Ubuntu, with Linux 3.13.0-40-generic\''
+	   $contrail_dist_kernel_version = "3.13.0-83"
+           $contrail_grub_string = 'GRUB_DEFAULT=\'Advanced options for Ubuntu>Ubuntu, with Linux 3.13.0-83-generic\''
        } else {
 	   $contrail_dist_kernel_version = "3.13.0-34"
            $contrail_grub_string = 'GRUB_DEFAULT=\'Advanced options for Ubuntu>Ubuntu, with Linux 3.13.0-34-generic\''