Skip to content

Commit 4ff2549

Browse files
Merge pull request openstack-k8s-operators#1017 from rabi/ipa_branch
Pin IPA image branch
2 parents e5e9d2d + 2b6fe93 commit 4ff2549

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -504,6 +504,7 @@ TELEMETRY_KUTTL_NAMESPACE ?= telemetry-kuttl-tests
504504
# BMO
505505
BMO_REPO ?= https://github.com/metal3-io/baremetal-operator
506506
BMO_BRANCH ?= release-0.6
507+
BMO_IPA_BRANCH ?= stable/2024.1
507508
BMO_COMMIT_HASH ?=
508509
BMO_PROVISIONING_INTERFACE ?=
509510
ifeq ($(NETWORK_ISOLATION_USE_DEFAULT_NETWORK), true)
@@ -687,6 +688,7 @@ crc_bmo_setup: $(if $(findstring true,$(INSTALL_CERT_MANAGER)), certmanager)
687688
mkdir -p ${OPERATOR_BASE_DIR}
688689
bash -c "CHECKOUT_FROM_OPENSTACK_REF=false OPERATOR_NAME=baremetal scripts/clone-operator-repo.sh"
689690
pushd ${OPERATOR_BASE_DIR}/baremetal-operator && sed -i -e '$$aIRONIC_IP=${BMO_IRONIC_HOST}' ironic-deployment/default/ironic_bmo_configmap.env config/default/ironic.env && popd
691+
pushd ${OPERATOR_BASE_DIR}/baremetal-operator && sed -i -e '$$aIPA_BRANCH=${BMO_IPA_BRANCH}' ironic-deployment/default/ironic_bmo_configmap.env && popd
690692
pushd ${OPERATOR_BASE_DIR}/baremetal-operator && sed -i 's/eth2/${BMO_PROVISIONING_INTERFACE}/g' ironic-deployment/default/ironic_bmo_configmap.env config/default/ironic.env && popd
691693
pushd ${OPERATOR_BASE_DIR}/baremetal-operator && sed -i 's/ENDPOINT\=http/ENDPOINT\=https/g' ironic-deployment/default/ironic_bmo_configmap.env config/default/ironic.env && popd
692694
pushd ${OPERATOR_BASE_DIR}/baremetal-operator && sed -i 's/172.22.0.2\:/${NNCP_CTLPLANE_IP_ADDRESS_PREFIX}.10\:/g' ironic-deployment/default/ironic_bmo_configmap.env config/default/ironic.env && popd

0 commit comments

Comments
 (0)