From 7661991a8f8fbd9282dcbbfcdeac7867e5925b96 Mon Sep 17 00:00:00 2001 From: Feng Pan Date: Sat, 30 Sep 2017 01:15:31 -0400 Subject: nosdn-fdio scenarios fixes - pin vpp/networking-vpp versions - Add external_network_bridge config back to puppet-neutron Change-Id: Ia58fb55638390757ea3350b2921897c4d315f9b5 Signed-off-by: Feng Pan --- apex/overcloud/overcloud_deploy.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'apex') diff --git a/apex/overcloud/overcloud_deploy.py b/apex/overcloud/overcloud_deploy.py index 93732bf3..e3248536 100644 --- a/apex/overcloud/overcloud_deploy.py +++ b/apex/overcloud/overcloud_deploy.py @@ -244,6 +244,12 @@ def prep_image(ds, img, tmp_dir, root_pw=None): virt_cmds.append( {con.VIRT_RUN_CMD: "cd /usr/lib/python2.7/site-packages && patch " "-p1 < neutron-patch-NSDriver.patch"}) + if sdn is False: + virt_cmds.extend([ + {con.VIRT_RUN_CMD: "yum remove -y vpp-lib"}, + {con.VIRT_RUN_CMD: "yum install -y " + "/root/nosdn_vpp_rpms/*.rpm"} + ]) if sdn == 'opendaylight': if ds_opts['odl_version'] != con.DEFAULT_ODL_VERSION: -- cgit 1.2.3-korg