X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=deploy%2Fironic%2Fironic.sh;h=6aefde634d6897a9cf37208feacab3d12ede5f4e;hb=refs%2Fchanges%2F04%2F4704%2F1;hp=88fb4cd4cbf634a190fb3610d1e9d3b87bafa546;hpb=b2e0b6304ab47b4432948c95a587facdbaa1e705;p=icn.git

diff --git a/deploy/ironic/ironic.sh b/deploy/ironic/ironic.sh
index 88fb4cd..6aefde6 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 {
@@ -90,12 +91,16 @@ function build_source {
 
 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
 }
 
 function clean {
-    kustomize build ${SCRIPTDIR}/icn | kubectl delete -f -
+    kustomize build ${SCRIPTDIR}/icn | kubectl delete --ignore-not-found=true -f -
     rm -rf ${IRONIC_DATA_DIR}
 }