Skip to content

Commit

Permalink
Make NNCP optional
Browse files Browse the repository at this point in the history
In case the the NNCP was already applied the user may wan to skip
applying the network configuration policy.
  • Loading branch information
hjensas committed Dec 9, 2024
1 parent 5a4d9bc commit 27ef1d4
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,7 @@ NMSTATE_SUBSCRIPTION ?= kubernetes-nmstate-operator
INSTALL_NMSTATE ?= true

# NNCP
INSTALL_NNCP ?= true
NNCP_NODES ?=
NNCP_INTERFACE ?= enp6s0
NNCP_BRIDGE ?= ospbr
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 27ef1d4

Please sign in to comment.