Code Review
/
icn.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add option to remove DHCP from Ironic"
[icn.git]
/
deploy
/
ironic
/
ironic.sh
diff --git
a/deploy/ironic/ironic.sh
b/deploy/ironic/ironic.sh
index
88fb4cd
..
d4f4bdd
100755
(executable)
--- a/
deploy/ironic/ironic.sh
+++ b/
deploy/ironic/ironic.sh
@@
-8,6
+8,7
@@
source $LIBDIR/logging.sh
source $LIBDIR/common.sh
NAMEPREFIX="capm3"
source $LIBDIR/common.sh
NAMEPREFIX="capm3"
+ENABLE_DHCP="${IRONIC_ENABLE_DHCP:-yes}"
trap err_exit ERR
function err_exit {
trap err_exit ERR
function err_exit {
@@
-90,7
+91,11
@@
function build_source {
function deploy {
fetch_image
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
}
kubectl wait --for=condition=Available --timeout=600s deployment/${NAMEPREFIX}-ironic -n ${NAMEPREFIX}-system
}