Browse Source

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

Zuul 6 months ago
parent
commit
6ade252df9

+ 1
- 1
README.md View File

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

+ 1
- 0
packstack/puppet/modules/packstack/manifests/nova/compute/libvirt.pp View File

@@ -47,6 +47,7 @@ class packstack::nova::compute::libvirt ()
47 47
       libvirt_virt_type        => $libvirt_virt_type,
48 48
       vncserver_listen         => $libvirt_vnc_bind_host,
49 49
       migration_support        => true,
50
+      libvirt_inject_partition => '-1',
50 51
     }
51 52
 
52 53
     # Remove libvirt's default network (usually virbr0) as it's unnecessary and

+ 3
- 0
tests/scenario001.sh View File

@@ -36,6 +36,9 @@ $SUDO packstack ${ADDITIONAL_ARGS} \
36 36
           --os-horizon-ssl=y \
37 37
           --amqp-enable-ssl=y \
38 38
           --glance-backend=file \
39
+          --os-neutron-l2-agent=ovn \
40
+          --os-neutron-ml2-type-drivers="geneve,flat" \
41
+          --os-neutron-ml2-tenant-network-types="geneve" \
39 42
           --provision-uec-kernel-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-vmlinuz" \
40 43
           --provision-uec-ramdisk-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-initrd" \
41 44
           --provision-uec-disk-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-disk.img" \

Loading…
Cancel
Save