From 31994377df73b3c71234f16bbc1c8ff4a281c0d2 Mon Sep 17 00:00:00 2001 From: Shweta Naik Date: Tue, 12 May 2015 16:06:15 -0700 Subject: [PATCH] If the upgrade is from prior to release R2.1 in ubuntu 14.04, since we have kernel version change appending the proper vrouter pkg. Partial-bug:1454393 Change-Id: I637ec033e0741a5c8594e36b5dadfaa3dbd52525 --- fabfile/tasks/upgrade.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fabfile/tasks/upgrade.py b/fabfile/tasks/upgrade.py index 97b49418f..4bce35e3d 100644 --- a/fabfile/tasks/upgrade.py +++ b/fabfile/tasks/upgrade.py @@ -4,7 +4,7 @@ from fabfile.tasks.provision import fixup_restart_haproxy_in_all_cfgm from fabfile.utils.cluster import get_toragent_nodes, get_tsn_nodes from fabfile.utils.commandline import * -from fabfile.utils.fabos import get_release, detect_ostype +from fabfile.utils.fabos import get_release, detect_ostype, get_linux_distro from fabfile.utils.install import get_compute_pkgs, get_openstack_pkgs @task @@ -160,7 +160,11 @@ def upgrade_compute_node(from_rel, pkg, *args): if (getattr(env, 'interface_rename', True) and detect_ostype() not in ['ubuntu', 'redhat']): pkgs.append('contrail-interface-name') - + if float(from_rel) < 2.1: + dist, version, extra = get_linux_distro() + if version == '14.04' and 'contrail-vrouter-3.13.0-35-generic' in pkgs: + pkgs.remove('contrail-vrouter-3.13.0-35-generic') + pkgs.append('contrail-vrouter-3.13.0-40-generic') # Identify roles of this node. roles = ['compute'] if env.host_string in get_tsn_nodes():