Change virtual deployment VMs nic model to virtio for dpdk support

Also make sure we update ipxe-roms-qemu to support pxe booting
VMs with multiple virtio interfaces defined (bz 1234601).

JIRA: APEX-119

Change-Id: I6fdecbd365450dec80e41f8407498d884b0bd79e
Signed-off-by: Feng Pan <fpan@redhat.com>

diff --git a/build/opnfv-apex-common.spec b/build/opnfv-apex-common.spec
index 536f9ec..42880da 100644 (file)
--- a/build/opnfv-apex-common.spec
+++ b/build/opnfv-apex-common.spec
@@ -8,10 +8,11 @@ License:      Apache 2.0
 URL:           https://gerrit.opnfv.org/gerrit/apex.git
 Source0:       opnfv-apex-common.tar.gz
 
-BuildArch:     noarch
-BuildRequires: python-docutils python34-devel
-Requires:      openstack-tripleo opnfv-apex-sdn opnfv-apex-undercloud openvswitch qemu-kvm bridge-utils libguestfs-tools
-Requires:      initscripts net-tools iputils iproute iptables python34 python34-yaml python3-jinja2
+BuildArch:      noarch
+BuildRequires:  python-docutils python34-devel
+Requires:       openstack-tripleo opnfv-apex-sdn opnfv-apex-undercloud openvswitch qemu-kvm bridge-utils libguestfs-tools
+Requires:       initscripts net-tools iputils iproute iptables python34 python34-yaml python3-jinja2
+Requires:       ipxe-roms-qemu >= 20160127-1
 
 %description
 Scripts for OPNFV deployment using RDO Manager

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 5fcc388..ab51a1f 100755 (executable)
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -527,7 +527,7 @@ EOF
       for n in private_network public_network storage_network api_network; do
         if [[ $enabled_network_list =~ $n ]]; then
           echo -n "$n "
-          virsh attach-interface --domain baremetal${i} --type network --source $n --model rtl8139 --config
+          virsh attach-interface --domain baremetal${i} --type network --source $n --model virtio --config
         fi
       done
     else

diff --git a/ci/dev_deploy_check.sh b/ci/dev_deploy_check.sh
index 8ba46ab..831ff1f 100755 (executable)
--- a/ci/dev_deploy_check.sh
+++ b/ci/dev_deploy_check.sh
@@ -25,6 +25,12 @@ if ! sudo yum $rdo_action -y  https://www.rdoproject.org/repos/rdo-release.rpm;
     exit 1
 fi
 
+# update ipxe-roms-qemu
+if ! sudo yum update -y ipxe-roms-qemu; then
+    echo "Failed to update ipxe-roms-qemu package..."
+    exit 1
+fi
+
 # check for other packages
 for i in epel-release python34-PyYAML openvswitch openstack-tripleo libguestfs libguestfs-tools-c libvirt-python; do
 # Make sure deploy deps are installed