Merge pull request #934 from pablintino/optional-skip-nmstate-install

Allow skipping install NMstate

Author: openshift-merge-bot[bot]

Makefile

@@ -436,6 +436,7 @@ 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
 
 # NNCP
 NNCP_NODES          ?=
@@ -693,9 +694,10 @@ 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_CERT_MANAGER)), certmanager)
-OPENSTACK_PREP_DEPS += $(if $(findstring true,$(NETWORK_ISOLATION)), nmstate nncp_with_retries netattach metallb metallb_config)
-OPENSTACK_PREP_DEPS += $(if $(findstring true,$(NETWORK_BGP)), nmstate nncp_with_retries netattach metallb metallb_config)
+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,$(BMO_SETUP)), crc_bmo_setup)
 
 .PHONY: openstack_prep