diff options
| author |   Billy O'Mahony <billy.o.mahony@intel.com> | 2016-01-13 18:00:00 +0000 |
|---|---|---|
| committer | Billy O'Mahony <billy.o.mahony@intel.com> | 2016-01-16 20:32:41 +0000 |
| commit | 8d68d8de881bd57b4e164219e8dcd09dfd2c05a2 (patch) | |
| tree | 3ea5cc570fc639a5e489c942b115505e05e3efb7 /fuel-plugin-ovsnfv/deployment_scripts/puppet/modules/ovsdpdk/files/kvm-wrapper.sh | |
| parent | 93f7683a2cd9b8020f8870dfc6b162b3d61c3fd2 (diff) | |
fuel_plugin: Working version on Montreal POD
- change libvirt on controller to 1.2.12
- change qemu on controller to 2.2.1
- work around _set_device_mtu issue
- remove existing OVS neutron plugin
- fixes to puppet resource ordering
- numerous other smaller changes
Change-Id: I9a7c66065013a43f5e88871ef8b9f1cdd1038245
Signed-off-by: Mark D. Gray <mark.d.gray@intel.com>
Signed-off-by: Billy O'Mahony <billy.o.mahony@intel.com>
Signed-off-by: Michal Ptacek <michalx.ptacek@intel.com>
Diffstat (limited to 'fuel-plugin-ovsnfv/deployment_scripts/puppet/modules/ovsdpdk/files/kvm-wrapper.sh')
| -rwxr-xr-x | fuel-plugin-ovsnfv/deployment_scripts/puppet/modules/ovsdpdk/files/kvm-wrapper.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fuel-plugin-ovsnfv/deployment_scripts/puppet/modules/ovsdpdk/files/kvm-wrapper.sh b/fuel-plugin-ovsnfv/deployment_scripts/puppet/modules/ovsdpdk/files/kvm-wrapper.sh index ea98408..818e64b 100755 --- a/fuel-plugin-ovsnfv/deployment_scripts/puppet/modules/ovsdpdk/files/kvm-wrapper.sh +++ b/fuel-plugin-ovsnfv/deployment_scripts/puppet/modules/ovsdpdk/files/kvm-wrapper.sh @@ -39,8 +39,8 @@ while [ $# -gt 0 ]; do esac done echo "qemu ${args[@]}" > /tmp/qemu.orig -if [ -e /usr/bin/qemu-system-x86_64 ]; then - exec /usr/bin/qemu-system-x86_64 "${args[@]}" +if [ -e /usr/local/bin/qemu-system-x86_64 ]; then + exec /usr/local/bin/qemu-system-x86_64 "${args[@]}" elif [ -e /usr/libexec/qemu-kvm.orig ]; then exec /usr/libexec/qemu-kvm.orig "${args[@]}" fi |