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

This commit is contained in:
Zuul 2018-10-10 08:09:42 +00:00 committed by Gerrit Code Review
commit 6ade252df9
3 changed files with 5 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

@ -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

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" \