SM:R3.0 build 36, Provision of compute node fails with kernel pointing to contrail-vrouter-3.13.0-40-generic instead of 3.13.0-85-generic

[sundarkh]

SM:R3.0 build 36, Provision of compute node fails with kernel pointing to contrail-vrouter-3.13.0-40-generic instead of 3.13.0-85-generic

Contrail Repo

ServerManager Node:
--------------------
root@nodeg19:/var/www/html/contrail/repo/ubuntu14kilo36# ls -lrt contrail-vrouter-3.13.0-85-generic_3.0.2.0-36_all.deb
-rw-r--r-- 1 33694 757 7049078 May 16 20:31 contrail-vrouter-3.13.0-85-generic_3.0.2.0-36_all.deb

On Target Node :
---------------
 (/Stage[compute]/Contrail::Compute::Install/Notify[compute_notify_2]/message) defined 'message' as '###DEBUG contrail_dist_kernel_version 3.13.0-40-generic and system kernel version is 3.13.0-40-generic'
May 16 21:25:03 nodeg37 puppet-agent[22837]: Kernel Update Successful!
May 16 21:25:03 nodeg37 puppet-agent[22837]: (/Stage[compute]/Contrail::Compute::Install/Notify[compute_notify_5]/message) defined 'message' as 'Kernel Update Successful!'
May 16 21:25:03 nodeg37 puppet-agent[22837]: enable_dpdk = false
May 16 21:25:03 nodeg37 puppet-agent[22837]: (/Stage[compute]/Contrail::Compute::Install/Notify[compute_notify_6]/message) defined 'message' as 'enable_dpdk = false'
May 16 21:25:04 nodeg37 puppet-agent[22837]: Could not update: Execution of '/usr/bin/apt-get -q -y -o DPkg::Options::=--force-confold install contrail-vrouter-3.13.0-40-generic' returned 100: Reading package lists...
May 16 21:25:04 nodeg37 puppet-agent[22837]: Building dependency tree...
May 16 21:25:04 nodeg37 puppet-agent[22837]: Reading state information...
May 16 21:25:04 nodeg37 puppet-agent[22837]: E: Unable to locate package contrail-vrouter-3.13.0-40-generic
May 16 21:25:04 nodeg37 puppet-agent[22837]: E: Couldn't find any package by regex 'contrail-vrouter-3.13.0-40-generic'

[sundarkh (sundar-kh)]

Related bug https://bugs.launchpad.net/juniperopenstack/+bug/1580670 3.13.0-85 kernel support in mainline and R3.0 with vrouter builds default with this Edit

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/20297
Submitter: Dheeraj Gautam (<email address hidden>)

[sundarkh (sundar-kh)]

Seen with build 38 also

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/20297
Committed: http://github.org/Juniper/contrail-puppet/commit/d019b2ba34004593c1a062e23f7b0e2331c58363
Submitter: Zuul
Branch: R3.0

commit d019b2ba34004593c1a062e23f7b0e2331c58363
Author: Dheeraj Gautam <email address hidden>
Date: Tue May 17 02:52:09 2016 -0700

SM-User-Kernel: Fix user specified kernel package.

Closes-bug: #1582604

instead of using kernel_version, params.pp was referring to
contrail_kernel_version. due to this, else condition was hit always and
admin/user specified kernel will not come into effect.

PATCH 2:
Updated 3.13.0-40 to 3.13.0-85 at all places.

Change-Id: I6420e12ad73d9823e17366770d7e80a73e117c75

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/21003
Submitter: Dheeraj Gautam (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/21003
Committed: http://github.org/Juniper/contrail-puppet/commit/cd0e49e9323fae9e41e2f9c1cd98f1d25814e933
Submitter: Zuul
Branch: master

commit cd0e49e9323fae9e41e2f9c1cd98f1d25814e933
Author: Dheeraj Gautam <email address hidden>
Date: Tue May 17 02:52:09 2016 -0700

SM-User-Kernel: Fix user specified kernel package.

Closes-bug: #1582604

instead of using kernel_version, params.pp was referring to
contrail_kernel_version. due to this, else condition was hit always and
admin/user specified kernel will not come into effect.

PATCH 2:
Updated 3.13.0-40 to 3.13.0-85 at all places.

PATCH 2:
Updated 3.13.0-83 to 3.13.0-85 at all places.

Conflicts:
 contrail/environment/modules/contrail/manifests/compute/install.pp
 contrail/environment/modules/contrail/manifests/params.pp

Change-Id: I6420e12ad73d9823e17366770d7e80a73e117c75