diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-06-15 16:24:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-06-15 16:24:11 +0000 |
| commit | 46d17cd2e33b9a410f55d850aa46dfa3c8c1e84c (patch) | |
| tree | 552049934281c289e7b8be2c191625ebe27fb427 | |
| parent | 3f45ea46772a2a2559df77704d74899fd02f3a9a (diff) | |
| parent | 32e774931b7f697f0825e99247787df1caee4c55 (diff) | |
Merge "Change virtual deployment VMs nic model to virtio for dpdk support"
| -rw-r--r-- | build/opnfv-apex-common.spec | 9 | ||||
| -rwxr-xr-x | ci/deploy.sh | 2 | ||||
| -rwxr-xr-x | ci/dev_deploy_check.sh | 6 |
3 files changed, 12 insertions, 5 deletions
diff --git a/build/opnfv-apex-common.spec b/build/opnfv-apex-common.spec index 536f9ec3..42880dab 100644 --- 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 44914f22..05e2fa2b 100755 --- 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 8ba46ab0..831ff1fd 100755 --- 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 |