From 7647f4d02125b276128ddfec55bb53bad4c3585e Mon Sep 17 00:00:00 2001 From: gryf Date: Mon, 17 May 2021 19:16:15 +0200 Subject: [PATCH] Use OVS over OVN in kuryr devstack deployment --- examples/kuryr_multinode_master.yaml | 4 ++++ examples/kuryr_multinode_worker.yaml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/examples/kuryr_multinode_master.yaml b/examples/kuryr_multinode_master.yaml index 0d38ae1..98d5c4d 100644 --- a/examples/kuryr_multinode_master.yaml +++ b/examples/kuryr_multinode_master.yaml @@ -117,9 +117,13 @@ write_files: KURYR_K8S_MULTI_WORKER_TESTS="True" LOGFILE="/opt/stack/logs/devstacklog.txt" LOG_COLOR="False" + ML2_L3_PLUGIN="router" OCTAVIA_AMP_IMAGE_FILE="/tmp/test-only-amphora-x64-haproxy-ubuntu-bionic.qcow2" OCTAVIA_AMP_IMAGE_NAME="test-only-amphora-x64-haproxy-ubuntu-bionic" OCTAVIA_AMP_IMAGE_SIZE="3" + Q_AGENT="openvswitch" + Q_ML2_TENANT_NETWORK_TYPE="vxlan" + Q_ML2_PLUGIN_MECHANISM_DRIVERS="openvswitch,linuxbridge" RABBIT_PASSWORD="secretrabbit" RECLONE="no" SERVICE_PASSWORD="secretservice" diff --git a/examples/kuryr_multinode_worker.yaml b/examples/kuryr_multinode_worker.yaml index 2f11acb..6f3f91f 100644 --- a/examples/kuryr_multinode_worker.yaml +++ b/examples/kuryr_multinode_worker.yaml @@ -70,6 +70,7 @@ write_files: DATABASE_HOST="192.168.10.10" DATABASE_PASSWORD="secretdatabase" GLANCE_HOSTPORT="192.168.10.10:9292" + ML2_L3_PLUGIN="router" KURYR_ENABLED_HANDLERS="vif,endpoints,service,namespace,pod_label,policy,kuryrnetworkpolicy,kuryrnetwork,kuryrport,kuryrloadbalancer" KURYR_FORCE_IMAGE_BUILD="True" KURYR_EP_DRIVER_OCTAVIA_PROVIDER="amphora" @@ -78,6 +79,9 @@ write_files: KURYR_K8S_CONTAINERIZED_DEPLOYMENT="True" LOGFILE="/opt/stack/logs/devstacklog.txt" LOG_COLOR="False" + Q_AGENT="openvswitch" + Q_ML2_TENANT_NETWORK_TYPE="vxlan" + Q_ML2_PLUGIN_MECHANISM_DRIVERS="openvswitch,linuxbridge" RABBIT_HOST="192.168.10.10" RABBIT_PASSWORD="secretrabbit" RECLONE="no"