diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-10-02 13:08:22 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-10-02 13:08:22 +0000 |
| commit | 7d77be7913b633291e6d864b0a3a2db7e9c18a0b (patch) | |
| tree | cfcf2ceda00949c538dbba4dd0342685894f51c2 /apex | |
| parent | e6a9d7cebc9f6083a72863102138ab76a75ae3c9 (diff) | |
| parent | 7661991a8f8fbd9282dcbbfcdeac7867e5925b96 (diff) | |
Merge "nosdn-fdio scenarios fixes"
Diffstat (limited to 'apex')
| -rw-r--r-- | apex/overcloud/overcloud_deploy.py | 6 |
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: |