X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=deploy%2Fironic%2Fironic.sh;h=5325d61288ace0d867e93fa7c27d5dc6b04bebfc;hb=038ef9e91d14bb90a81a6273a461a6472e18b408;hp=8f46c8ce11e872cb4ad4c5ea48234a831d7be568;hpb=718425df1f99dd7f93cb60bbe9eb01cab9e47f2a;p=icn.git

diff --git a/deploy/ironic/ironic.sh b/deploy/ironic/ironic.sh
index 8f46c8c..5325d61 100755
--- a/deploy/ironic/ironic.sh
+++ b/deploy/ironic/ironic.sh
@@ -8,6 +8,7 @@ source $LIBDIR/logging.sh
 source $LIBDIR/common.sh
 
 NAMEPREFIX="capm3"
+ENABLE_DHCP="${IRONIC_ENABLE_DHCP:-yes}"
 
 trap err_exit ERR
 function err_exit {
@@ -26,11 +27,16 @@ function build_source {
         mkdir -p $(dirname ${dst})
         envsubst <${src} >${dst}
     done
+    sed -i -e '/name: quay.io\/metal3-io\/ironic/{n;s/newTag:.*/newTag: '"${BMO_VERSION}"'/;}' ${SCRIPTDIR}/icn/kustomization.yaml
 }
 
 function deploy {
     fetch_image
-    kustomize build ${SCRIPTDIR}/icn | kubectl apply -f -
+    local layer="${SCRIPTDIR}/icn"
+    if [[ ${ENABLE_DHCP} != "yes" ]]; then
+	layer="${SCRIPTDIR}/icn-no-dhcp"
+    fi
+    kustomize build ${layer} | kubectl apply -f -
     kubectl wait --for=condition=Available --timeout=600s deployment/${NAMEPREFIX}-ironic -n ${NAMEPREFIX}-system
 }