Closes-Bug: #1727553

Default kernel version given for Xenial incase the user did not specify it in the json file and had 'kernel_upgrade' set to true Change-Id: If1de8660991f0d3a69082c2a316211f33ede1cfc
Juniper · Oct 27, 2017 · 8754793 · 8754793
1 parent 1debe8c
commit 8754793
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/contrail/environment/modules/contrail/manifests/compute/install.pp b/contrail/environment/modules/contrail/manifests/compute/install.pp
@@ -1,6 +1,7 @@
 class contrail::compute::install(
   $opencontrail_only = false,
   $default_trusty_kernel = $::contrail::params::default_trusty_kernel,
+  $default_xenial_kernel = $::contrail::params::default_xenial_kernel,
   $enable_lbaas =  $::contrail::params::enable_lbaas,
   $enable_dpdk=  $::contrail::params::enable_dpdk,
 ) {
@@ -59,6 +60,8 @@
 
         } elsif ($::kernelrelease == "${default_trusty_kernel}-generic") {
           $vrouter_pkg = "contrail-vrouter-${default_trusty_kernel}-generic"
+        } elsif ($::kernelrelease == "${default_xenial_kernel}-generic") {
+          $vrouter_pkg = "contrail-vrouter-${default_xenial_kernel}-generic"
         } else {
           $vrouter_pkg = 'contrail-vrouter-dkms'
         }

diff --git a/contrail/environment/modules/contrail/manifests/init.pp b/contrail/environment/modules/contrail/manifests/init.pp
@@ -683,6 +683,7 @@
     $kernel_upgrade = false,
     $kernel_version = '',
     $default_trusty_kernel = '3.13.0-110',
+    $default_xenial_kernel = '4.4.0-38',
     $redis_password = '',
     $storage_num_osd = '',
     $storage_fsid = '',
@@ -792,6 +793,7 @@
 	kernel_upgrade =>			hiera(contrail::kernel_upgrade, hiera(contrail::params::kernel_upgrade, $kernel_upgrade)),
 	kernel_version =>			hiera(contrail::kernel_version, hiera(contrail::params::kernel_version, $kernel_version)),
 	default_trusty_kernel =>                hiera(contrail::default_trusty_kernel, $default_trusty_kernel),
+	default_xenial_kernel =>                hiera(contrail::default_xenial_kernel, $default_xenial_kernel),
 	host_non_mgmt_ip =>			hiera(contrail::host_non_mgmt_ip, hiera(contrail::params::host_non_mgmt_ip, $host_non_mgmt_ip)),
 	host_non_mgmt_gateway =>		hiera(contrail::host_non_mgmt_gateway, hiera(contrail::params::host_non_mgmt_gateway, $host_non_mgmt_gateway)),
 	host_roles =>				hiera(contrail::host_roles, hiera(contrail::params::host_roles, $host_roles)),

diff --git a/contrail/environment/modules/contrail/manifests/params.pp b/contrail/environment/modules/contrail/manifests/params.pp
@@ -661,6 +661,7 @@
     $kernel_upgrade,
     $kernel_version,
     $default_trusty_kernel,
+    $default_xenial_kernel,
     $redis_password,
     $storage_num_osd,
     $storage_fsid,
@@ -968,6 +969,8 @@
     } else {
        if ($lsbdistrelease == "14.04") {
            $contrail_dist_kernel_version = $default_trusty_kernel
+       } elsif ($lsbdistrelease == "16.04") {
+           $contrail_dist_kernel_version = $default_xenial_kernel
        } else {
            $contrail_dist_kernel_version = "3.13.0-34"
        }