Revert "Temporary switch to ovs in scenario 001, fix gate"

The bug has been fixed in the kernel already.

Note this cherry-pick has been modified to keep libvirt_inject_partition
default value [1].

[1] https://review.openstack.org/#/c/641387/

This reverts commit e9e6ad87a0.

Depends-On: https://review.openstack.org/#/c/594128/
Change-Id: Ief887a7efc0728333bb633c01b7fbef0a68496a3
This commit is contained in:
Alfredo Moralejo 2018-08-13 11:18:31 +00:00
parent 81ea698ebc
commit e47cb736f8
2 changed files with 4 additions and 1 deletions

View File

@ -178,7 +178,7 @@ the current matrix of available tests:
| glance | | file | swift | file |
| nova | X | X | X | X |
| neutron | X | X | X | X |
| neutron plugin | ovs | ovs | ovs | ovs |
| neutron plugin | ovs | ovn | ovs | ovs |
| lbaasv2 | | | X | |
| vpnaas | | | | |
| cinder | X | X | | |

View File

@ -36,6 +36,9 @@ $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-$CIRROS_VERSION-$CIRROS_ARCH-vmlinuz" \
--provision-uec-ramdisk-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-initrd" \
--provision-uec-disk-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-disk.img" \