From: Tim Rozet <trozet@redhat.com>
Date: Tue, 17 Apr 2018 17:54:27 +0000 (-0400)
Subject: Fixes OVN scenario
X-Git-Tag: opnfv-7.0.0~64^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ee70c386a8560303693082f449543ad36f0f2f9c;p=apex.git

Fixes OVN scenario

The OVN scenario would not deploy due to failures in trying to upgrades
to OVS 2.8 from OVS 2.7

JIRA: APEX-594.

Change-Id: Id84e488da8d2335f2240930c68119d0e2f6faf9c
Signed-off-by: Tim Rozet <trozet@redhat.com>
---

diff --git a/apex/overcloud/deploy.py b/apex/overcloud/deploy.py
index eb7aefa1..3fb812e6 100644
--- a/apex/overcloud/deploy.py
+++ b/apex/overcloud/deploy.py
@@ -408,14 +408,6 @@ def prep_image(ds, ns, img, tmp_dir, root_pw=None, docker_tag=None,
         if docker_tag:
             patched_containers = patched_containers.union({'opendaylight'})
 
-    if sdn == 'ovn':
-        virt_cmds.extend([
-            {con.VIRT_RUN_CMD: "cd /root/ovs28 && yum update -y "
-                               "*openvswitch*"},
-            {con.VIRT_RUN_CMD: "cd /root/ovs28 && yum downgrade -y "
-                               "*openvswitch*"}
-        ])
-
     if patches:
         if ds_opts['os_version'] == 'master':
             branch = ds_opts['os_version']