From 27ef1d40b13315d48e78fbfd28f49093e0b7e408 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Jens=C3=A5s?= Date: Tue, 10 Dec 2024 00:00:40 +0100 Subject: [PATCH] Make NNCP optional In case the the NNCP was already applied the user may wan to skip applying the network configuration policy. --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 704861b..8996846 100644 --- a/Makefile +++ b/Makefile @@ -451,6 +451,7 @@ NMSTATE_SUBSCRIPTION ?= kubernetes-nmstate-operator INSTALL_NMSTATE ?= true # NNCP +INSTALL_NNCP ?= true NNCP_NODES ?= NNCP_INTERFACE ?= enp6s0 NNCP_BRIDGE ?= ospbr @@ -714,10 +715,11 @@ endif ##@ OPENSTACK OPENSTACK_PREP_DEPS := validate_marketplace -OPENSTACK_PREP_NMSTATE_DEPS := $(if $(findstring true,$(INSTALL_NMSTATE)), nmstate nncp_with_retries, nncp_with_retries) +OPENSTACK_PREP_DEPS += $(if $(findstring true,$(INSTALL_NMSTATE)), nmstate) +OPENSTACK_PREP_DEPS += $(if $(findstring true,$(INSTALL_NNCP)), nncp_with_retries) OPENSTACK_PREP_DEPS += $(if $(findstring true,$(INSTALL_CERT_MANAGER)), certmanager) -OPENSTACK_PREP_DEPS += $(if $(findstring true,$(NETWORK_ISOLATION)), ${OPENSTACK_PREP_NMSTATE_DEPS} netattach metallb metallb_config) -OPENSTACK_PREP_DEPS += $(if $(findstring true,$(NETWORK_BGP)), ${OPENSTACK_PREP_NMSTATE_DEPS} netattach metallb metallb_config) +OPENSTACK_PREP_DEPS += $(if $(findstring true,$(NETWORK_ISOLATION)), netattach metallb metallb_config) +OPENSTACK_PREP_DEPS += $(if $(findstring true,$(NETWORK_BGP)), netattach metallb metallb_config) OPENSTACK_PREP_DEPS += $(if $(findstring true,$(BMO_SETUP)), crc_bmo_setup) .PHONY: openstack_prep