Skip to content

Commit

Permalink
Merge pull request #934 from pablintino/optional-skip-nmstate-install
Browse files Browse the repository at this point in the history
Allow skipping install NMstate
  • Loading branch information
openshift-merge-bot[bot] authored Oct 21, 2024
2 parents 857049b + 837c7b9 commit f998b0a
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 ?=
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit f998b0a

Please sign in to comment.