Merge "Using the correct version of vrouter generic pkg"

Juniper · Feb 3, 2017 · 157825a · 157825a
2 parents 21a143a + 16edb8a
commit 157825a
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/fabfile/tasks/upgrade.py b/fabfile/tasks/upgrade.py
@@ -219,6 +219,11 @@ def upgrade_compute_node(from_rel, pkg, *args, **kwargs):
                     if version == '14.04' and 'contrail-vrouter-3.13.0-40-generic' in pkgs:
                        pkgs.remove('contrail-vrouter-3.13.0-40-generic')
                        pkgs.append('contrail-vrouter-3.13.0-85-generic')
+                elif LooseVersion(from_rel) <= LooseVersion('3.1.2.0'):
+                    dist, version, extra = get_linux_distro()
+                    if version == '14.04' and 'contrail-vrouter-3.13.0-85-generic' in pkgs:
+                       pkgs.remove('contrail-vrouter-3.13.0-85-generic')
+                       pkgs.append('contrail-vrouter-3.13.0-100-generic')
                 # Identify roles of this node.
                 roles = ['compute']
                 if env.host_string in get_tsn_nodes():