summaryrefslogtreecommitdiffstats
path: root/apex/overcloud/deploy.py
diff options
context:
space:
mode:
authorRicardo Noriega <rnoriega@redhat.com>2018-08-23 19:10:01 +0200
committerTim Rozet <trozet@redhat.com>2018-08-23 14:09:59 -0400
commitdc83fb1667a1a65ad333a3aab1c2843601180b23 (patch)
tree179489f3a5fe4a2b7538fd2ed99976375c26b7ad /apex/overcloud/deploy.py
parent85a3c2e347c1555bf589a7574abd0b651196952f (diff)
Recover fix to install custom OVS
Need this fix to make VLAN tenant networks to work. Change-Id: Ie2dea9f0145c576e1b36280e6340ed2cc0460179 Signed-off-by: Ricardo Noriega <rnoriega@redhat.com>
Diffstat (limited to 'apex/overcloud/deploy.py')
-rw-r--r--apex/overcloud/deploy.py13
1 files changed, 13 insertions, 0 deletions
diff --git a/apex/overcloud/deploy.py b/apex/overcloud/deploy.py
index fcd7f0f6..6e1d5bb4 100644
--- a/apex/overcloud/deploy.py
+++ b/apex/overcloud/deploy.py
@@ -360,6 +360,19 @@ def prep_image(ds, ns, img, tmp_dir, root_pw=None, docker_tag=None,
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)}
+ ])
if dataplane == 'fdio':
# Patch neutron with using OVS external interface for router