summaryrefslogtreecommitdiffstats
path: root/apex
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2017-09-30 01:15:31 -0400
committerFeng Pan <fpan@redhat.com>2017-09-30 21:39:28 -0400
commit7661991a8f8fbd9282dcbbfcdeac7867e5925b96 (patch)
tree9e89d9190fa7155f31f6eb70e8c3424b37d6a69b /apex
parent8a8cb8e901db314fa59ed5275040b9e49b36663c (diff)
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 <fpan@redhat.com>
Diffstat (limited to 'apex')
-rw-r--r--apex/overcloud/overcloud_deploy.py6
1 files changed, 6 insertions, 0 deletions
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: