From 34b097325d59fdb058b1c5b48aa9a171f3197168 Mon Sep 17 00:00:00 2001
From: yatinkarel <ykarel@redhat.com>
Date: Wed, 11 Dec 2024 17:52:15 +0530
Subject: [PATCH] Restore nncp default

[1] created new parameter for NNCP setup and now it explicitly require
INSTALL_NNCP=false to be passed along with NETWORK_ISOLATION=false.
restoring the previous behavior by using previous defaults relying
on NETWORK_ISOLATION and NETWORK_BGP.

[1] https://github.com/openstack-k8s-operators/install_yamls/pull/969
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 2fa284f..9fc8c77 100644
--- a/Makefile
+++ b/Makefile
@@ -448,10 +448,10 @@ CEPH_CLIENT    ?= ${OPERATOR_BASE_DIR}/rook/deploy/examples/toolbox.yaml
 NMSTATE_NAMESPACE      ?= openshift-nmstate
 NMSTATE_OPERATOR_GROUP ?= openshift-nmstate-tn6k8
 NMSTATE_SUBSCRIPTION   ?= kubernetes-nmstate-operator
-INSTALL_NMSTATE        ?= true
+INSTALL_NMSTATE        ?= $(NETWORK_ISOLATION) || $(NETWORK_BGP)
 
 # NNCP
-INSTALL_NNCP        ?= true
+INSTALL_NNCP        ?= $(NETWORK_ISOLATION) || $(NETWORK_BGP)
 NNCP_NODES          ?=
 NNCP_INTERFACE      ?= enp6s0
 NNCP_BRIDGE         ?= ospbr