From bd48eb11d2bdc22ac698f05f9da6728de1ab2978 Mon Sep 17 00:00:00 2001 From: Alfredo Moralejo Date: Mon, 13 Aug 2018 11:18:31 +0000 Subject: [PATCH] Revert "Temporary switch to ovs in scenario 001, fix gate" The bug has been fixed in the kernel already. This reverts commit e9e6ad87a0237908236c96b49932afa2e96a52c5. Depends-On: https://review.openstack.org/#/c/594128/ Change-Id: Ief887a7efc0728333bb633c01b7fbef0a68496a3 --- README.md | 2 +- .../puppet/modules/packstack/manifests/nova/compute/libvirt.pp | 1 + tests/scenario001.sh | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5698d2006..2fc7e7df2 100644 --- a/README.md +++ b/README.md @@ -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 | | | diff --git a/packstack/puppet/modules/packstack/manifests/nova/compute/libvirt.pp b/packstack/puppet/modules/packstack/manifests/nova/compute/libvirt.pp index 196ac82a7..627877590 100644 --- a/packstack/puppet/modules/packstack/manifests/nova/compute/libvirt.pp +++ b/packstack/puppet/modules/packstack/manifests/nova/compute/libvirt.pp @@ -47,6 +47,7 @@ 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 3a5b834ed..1a20935f9 100755 --- a/tests/scenario001.sh +++ b/tests/scenario001.sh @@ -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" \