From c444d0ab3a9f1d63854789ccf2e59b5456bf3769 Mon Sep 17 00:00:00 2001 From: Alan Pevec Date: Sat, 6 Jan 2018 21:59:44 +0000 Subject: [PATCH] Revert "TEMP disable OVN and Gnocchi" This reverts commit 115b0edb76938a1061c89a9f0034a30ca5406901. Change-Id: Ib5f148772f768db9c41ae2cc72fccc22644fc6d7 --- .zuul.yaml | 2 ++ README.md | 2 +- tests/scenario001.sh | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.zuul.yaml b/.zuul.yaml index 8fdb85af8..202e79580 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -59,7 +59,9 @@ jobs: - packstack-integration-scenario001-tempest - packstack-integration-scenario002-tempest + - packstack-integration-scenario003-tempest gate: jobs: - packstack-integration-scenario001-tempest - packstack-integration-scenario002-tempest + - packstack-integration-scenario003-tempest diff --git a/README.md b/README.md index 3083a1d3d..e9b7cae6e 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/tests/scenario001.sh b/tests/scenario001.sh index e6736511a..4c165b3e8 100755 --- a/tests/scenario001.sh +++ b/tests/scenario001.sh @@ -27,6 +27,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-0.3.5-x86_64-vmlinuz" \ --provision-uec-ramdisk-url="/tmp/cirros/cirros-0.3.5-x86_64-initrd" \ --provision-uec-disk-url="/tmp/cirros/cirros-0.3.5-x86_64-disk.img" \