summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2018-04-19 02:12:50 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-04-19 02:12:50 +0000
commitbfe5aaa753e0ba5397b68e72b99057950db12b86 (patch)
tree1982cbe671331194486de6e5da182db746ac3438
parente4c83fb13fe0f4bfee23fd044e662961acb62908 (diff)
parentee70c386a8560303693082f449543ad36f0f2f9c (diff)
Merge "Fixes OVN scenario"
-rw-r--r--apex/overcloud/deploy.py8
1 files changed, 0 insertions, 8 deletions
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']