Merge pull request #971 from karelyatin/nncp_default

Restore nncp default
openstack-k8s-operators · Dec 11, 2024 · a7f183b · a7f183b
2 parents 71311cc + 34b0973
commit a7f183b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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