Merge pull request #1091 from slagle/osimage

Add $BAREMETAL_OS_IMG

Author: openshift-merge-bot[bot]

Makefile

@@ -386,6 +386,7 @@ BAREMETAL_BRANCH        ?= ${OPENSTACK_K8S_BRANCH}
 BAREMETAL_COMMIT_HASH   ?=
 BMH_NAMESPACE           ?= ${NAMESPACE}
 BAREMETAL_OS_CONTAINER_IMG ?=
+BAREMETAL_OS_IMG ?=
 
 # Dataplane Operator
 DATAPLANE_TIMEOUT                                ?= 30m
@@ -948,6 +949,7 @@ edpm_deploy_baremetal_prep: export EDPM_ANSIBLE_SECRET=${DATAPLANE_ANSIBLE_SECRE
 edpm_deploy_baremetal_prep: export EDPM_ANSIBLE_USER=${DATAPLANE_ANSIBLE_USER}
 edpm_deploy_baremetal_prep: export EDPM_BMH_NAMESPACE=${BMH_NAMESPACE}
 edpm_deploy_baremetal_prep: export EDPM_OS_CONTAINER_IMG=${BAREMETAL_OS_CONTAINER_IMG}
+edpm_deploy_baremetal_prep: export EDPM_OS_IMG=${BAREMETAL_OS_IMG}
 edpm_deploy_baremetal_prep: export EDPM_PROVISIONING_INTERFACE=${BMO_PROVISIONING_INTERFACE}
 edpm_deploy_baremetal_prep: export EDPM_CTLPLANE_INTERFACE=${BM_CTLPLANE_INTERFACE}
 edpm_deploy_baremetal_prep: export EDPM_TOTAL_NODES=${DATAPLANE_TOTAL_NODES}

scripts/gen-edpm-baremetal-kustomize.sh

@@ -113,6 +113,13 @@ cat <<EOF >>kustomization.yaml
       value: ${EDPM_OS_CONTAINER_IMG}
 EOF
 fi
+if [ "$EDPM_OS_IMG" != "" ]; then
+cat <<EOF >>kustomization.yaml
+    - op: add
+      path: /spec/baremetalSetTemplate/osImage
+      value: ${EDPM_OS_IMG}
+EOF
+fi
 if [ "$EDPM_CTLPLANE_INTERFACE" != "" ]; then
 cat <<EOF >>kustomization.yaml
     - op: replace