Merge "Revert "Temporary switch to ovs in scenario 001, fix gate""
This commit is contained in:
commit
6ade252df9
@ -178,7 +178,7 @@ the current matrix of available tests:
|
|||||||
| glance | | file | swift | file |
|
| glance | | file | swift | file |
|
||||||
| nova | X | X | X | X |
|
| nova | X | X | X | X |
|
||||||
| neutron | X | X | X | X |
|
| neutron | X | X | X | X |
|
||||||
| neutron plugin | ovs | ovs | ovs | ovs |
|
| neutron plugin | ovs | ovn | ovs | ovs |
|
||||||
| lbaasv2 | | | X | |
|
| lbaasv2 | | | X | |
|
||||||
| vpnaas | | | | |
|
| vpnaas | | | | |
|
||||||
| cinder | X | X | | |
|
| cinder | X | X | | |
|
||||||
|
@ -47,6 +47,7 @@ class packstack::nova::compute::libvirt ()
|
|||||||
libvirt_virt_type => $libvirt_virt_type,
|
libvirt_virt_type => $libvirt_virt_type,
|
||||||
vncserver_listen => $libvirt_vnc_bind_host,
|
vncserver_listen => $libvirt_vnc_bind_host,
|
||||||
migration_support => true,
|
migration_support => true,
|
||||||
|
libvirt_inject_partition => '-1',
|
||||||
}
|
}
|
||||||
|
|
||||||
# Remove libvirt's default network (usually virbr0) as it's unnecessary and
|
# Remove libvirt's default network (usually virbr0) as it's unnecessary and
|
||||||
|
@ -36,6 +36,9 @@ $SUDO packstack ${ADDITIONAL_ARGS} \
|
|||||||
--os-horizon-ssl=y \
|
--os-horizon-ssl=y \
|
||||||
--amqp-enable-ssl=y \
|
--amqp-enable-ssl=y \
|
||||||
--glance-backend=file \
|
--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-kernel-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-vmlinuz" \
|
||||||
--provision-uec-ramdisk-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-initrd" \
|
--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" \
|
--provision-uec-disk-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-disk.img" \
|
||||||
|
Loading…
Reference in New Issue
Block a user