From 1574a38aa97e9dac9bc2848faccef13fe10a285e Mon Sep 17 00:00:00 2001 From: yatin Date: Thu, 17 May 2018 10:48:51 +0530 Subject: [PATCH] Temporary switch to ovs in scenario 001, fix gate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Until https://bugs.launchpad.net/packstack/+bug/1771500 is fixed, temporary switch to ovs in scenario 001. Also, set inject_partition to the default value of -2 in nova.conf. We are having problems in the gate in OVH nodes (see [1]), and doing this prevents us from using the problematic libguestfs code. [1] - https://bugs.launchpad.net/packstack/+bug/1701032 Change-Id: Ifed85df073104684cd415792785acd12e2f89aa4 Related-Bug: #1771500 Co-Authored-By: Javier Peña (cherry picked from commit e9e6ad87a0237908236c96b49932afa2e96a52c5) --- README.md | 2 +- .../puppet/modules/packstack/manifests/nova/compute/libvirt.pp | 1 - tests/scenario001.sh | 3 --- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/README.md b/README.md index b166aa3d0..9ee0eb715 100644 --- a/README.md +++ b/README.md @@ -177,7 +177,7 @@ This is the current matrix of available tests: | glance | file | swift | file | | nova | X | X | X | | neutron | X | X | X | -| neutron plugin | ovn | ovs | ovs | +| neutron plugin | ovs | ovs | ovs | | lbaasv2 | | X | | | vpnaas | | X | | | cinder | X | | | diff --git a/packstack/puppet/modules/packstack/manifests/nova/compute/libvirt.pp b/packstack/puppet/modules/packstack/manifests/nova/compute/libvirt.pp index 627877590..196ac82a7 100644 --- a/packstack/puppet/modules/packstack/manifests/nova/compute/libvirt.pp +++ b/packstack/puppet/modules/packstack/manifests/nova/compute/libvirt.pp @@ -47,7 +47,6 @@ class packstack::nova::compute::libvirt () libvirt_virt_type => $libvirt_virt_type, vncserver_listen => $libvirt_vnc_bind_host, migration_support => true, - libvirt_inject_partition => '-1', } # Remove libvirt's default network (usually virbr0) as it's unnecessary and diff --git a/tests/scenario001.sh b/tests/scenario001.sh index 4c165b3e8..e6736511a 100755 --- a/tests/scenario001.sh +++ b/tests/scenario001.sh @@ -27,9 +27,6 @@ $SUDO packstack ${ADDITIONAL_ARGS} \ --os-horizon-ssl=y \ --amqp-enable-ssl=y \ --glance-backend=file \ - --os-neutron-l2-agent=ovn \ - --os-neutron-ml2-type-drivers="geneve,flat" \ - --os-neutron-ml2-tenant-network-types="geneve" \ --provision-uec-kernel-url="/tmp/cirros/cirros-0.3.5-x86_64-vmlinuz" \ --provision-uec-ramdisk-url="/tmp/cirros/cirros-0.3.5-x86_64-initrd" \ --provision-uec-disk-url="/tmp/cirros/cirros-0.3.5-x86_64-disk.img" \