diff options
| author |   Feng Pan <fpan@redhat.com> | 2017-10-02 10:26:32 -0400 |
|---|---|---|
| committer |   Tim Rozet <trozet@redhat.com> | 2017-10-02 21:28:28 +0000 |
| commit | 2ee71b201c0a607f1814bf5fe3e6971f6357db42 (patch) | |
| tree | 58d2f6c499ad4528f13ba80afece413b609a11de /apex/overcloud/overcloud_deploy.py | |
| parent | 2be3a2ce5c1c90c489f424bc9ac80de5336bbcc5 (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/overcloud/overcloud_deploy.py')
| -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: |