From d74e4a6fd4d9362f9d673afffbb310a599f800f8 Mon Sep 17 00:00:00 2001 From: Steve Mattar Date: Sun, 7 Mar 2021 02:19:12 +0200 Subject: [PATCH] feat: support ovn Signed-off-by: Steve Mattar --- Makefile | 6 ++++++ cluster_settings.ovn | 10 ++++++++++ 2 files changed, 16 insertions(+) create mode 100644 cluster_settings.ovn diff --git a/Makefile b/Makefile index 3153e0a..a43c455 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,12 @@ ifneq (,$(DAPPER_HOST_ARCH)) include $(SHIPYARD_DIR)/Makefile.inc CLUSTER_SETTINGS_FLAG = --cluster_settings $(DAPPER_SOURCE)/cluster_settings +ifneq (,$(filter ovn,$(_using))) +CLUSTER_SETTINGS_FLAG = --cluster_settings $(DAPPER_SOURCE)/cluster_settings.ovn +else +CLUSTER_SETTINGS_FLAG = --cluster_settings $(DAPPER_SOURCE)/cluster_settings +endif + override CLUSTERS_ARGS += $(CLUSTER_SETTINGS_FLAG) override DEPLOY_ARGS += $(CLUSTER_SETTINGS_FLAG) --deploytool helm export DEPLOY_ARGS diff --git a/cluster_settings.ovn b/cluster_settings.ovn new file mode 100644 index 0000000..ee25d11 --- /dev/null +++ b/cluster_settings.ovn @@ -0,0 +1,10 @@ +. "${SCRIPTS_DIR}"/lib/source_only + +# We need a minimal setup to verify the deployment works +clusters=('cluster1' 'cluster2') +cluster_nodes['cluster1']="control-plane worker worker" +cluster_nodes['cluster2']="control-plane worker worker" + +cluster_cni=( ['cluster1']="ovn" ['cluster2']="ovn" ) + +cluster_subm=( ['cluster1']="true" ['cluster2']="true" )