summaryrefslogtreecommitdiffstats
path: root/apex/overcloud/deploy.py
diff options
context:
space:
mode:
authorRicardo Noriega <rnoriega@redhat.com>2018-12-21 22:32:54 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-12-21 22:32:54 +0000
commitcf3f62e9bac681bad8e81c568893077f122da619 (patch)
tree47a4b985025d74da4e61a4433787535495f13d49 /apex/overcloud/deploy.py
parent56a2abfb7a1b23e1716beb16702d130226e4778d (diff)
parent4f988328adf5dd8735bbf0a9420528cd343cfcd3 (diff)
Merge "Always update OVS to 2.9.2"
Diffstat (limited to 'apex/overcloud/deploy.py')
-rw-r--r--apex/overcloud/deploy.py19
1 files changed, 4 insertions, 15 deletions
diff --git a/apex/overcloud/deploy.py b/apex/overcloud/deploy.py
index ccb21cec..27263740 100644
--- a/apex/overcloud/deploy.py
+++ b/apex/overcloud/deploy.py
@@ -368,21 +368,10 @@ def prep_image(ds, ns, img, tmp_dir, root_pw=None, docker_tag=None,
virt_cmds.append({con.VIRT_PW: pw_op})
if dataplane == 'ovs':
- if ds_opts['sfc']:
- oc_builder.inject_ovs_nsh(tmp_oc_image, tmp_dir)
- elif sdn == 'opendaylight':
- # FIXME(trozet) remove this after RDO is updated with fix for
- # https://bugzilla.redhat.com/show_bug.cgi?id=1544892
- ovs_file = os.path.basename(con.CUSTOM_OVS)
- ovs_url = con.CUSTOM_OVS.replace(ovs_file, '')
- utils.fetch_upstream_and_unpack(dest=tmp_dir, url=ovs_url,
- targets=[ovs_file])
- virt_cmds.extend([
- {con.VIRT_UPLOAD: "{}:/root/".format(os.path.join(tmp_dir,
- ovs_file))},
- {con.VIRT_RUN_CMD: "yum downgrade -y /root/{}".format(
- ovs_file)}
- ])
+ # FIXME(trozet) remove this after RDO is updated with fix for
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1544892
+ # https://review.rdoproject.org/r/#/c/13839/
+ oc_builder.inject_ovs_nsh(tmp_oc_image, tmp_dir)
if dataplane == 'fdio':
# Patch neutron with using OVS external interface for router