diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-06-08 14:36:36 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@172.30.200.206> | 2016-06-08 14:36:36 +0000 |
commit | e452ec9d11db0a94f6c3221a3ab7682245fc893e (patch) | |
tree | e5ae5cd6a034150bf1cb626fa220721047cff6c6 /patches/opnfv-fuel/0021-Build-bootstrap-image-for-arm64.patch | |
parent | 44026e0752ce42b3516679cc547703aa21be39e8 (diff) | |
parent | e7e2d84bec0d404057bce203f9c90231360e88ee (diff) |
Merge "Rebase: deploy related patch series."
Diffstat (limited to 'patches/opnfv-fuel/0021-Build-bootstrap-image-for-arm64.patch')
-rw-r--r-- | patches/opnfv-fuel/0021-Build-bootstrap-image-for-arm64.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/patches/opnfv-fuel/0021-Build-bootstrap-image-for-arm64.patch b/patches/opnfv-fuel/0021-Build-bootstrap-image-for-arm64.patch new file mode 100644 index 00000000..42218ad1 --- /dev/null +++ b/patches/opnfv-fuel/0021-Build-bootstrap-image-for-arm64.patch @@ -0,0 +1,39 @@ +From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com> +Date: Thu, 3 Mar 2016 19:04:07 +0100 +Subject: [PATCH] Build bootstrap image for arm64 + +For now the arch is hardcoded for simplicity. We should detect this +but how? If we're multi-arch then one bootstrap image should be built +per supported arch. This requires Fuel refactoring. +--- + build/bootstrap_admin_node.sh.patch | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +diff --git a/build/bootstrap_admin_node.sh.patch b/build/bootstrap_admin_node.sh.patch +index aeef3f7..c66b497 100644 +--- a/build/bootstrap_admin_node.sh.patch ++++ b/build/bootstrap_admin_node.sh.patch +@@ -53,6 +53,23 @@ + # Enable iptables + systemctl enable iptables.service + *************** ++*** 484,490 **** ++ local ret=1 ++ echo ${bs_progress_message} >&2 ++ set_ui_bootstrap_error "${bs_progress_message}" >&2 ++! if fuel-bootstrap -v --debug build --activate >>"$bs_build_log" 2>&1; then ++ ret=0 ++ fuel notify --topic "done" --send "${bs_done_message}" ++ else ++--- 484,490 ---- ++ local ret=1 ++ echo ${bs_progress_message} >&2 ++ set_ui_bootstrap_error "${bs_progress_message}" >&2 ++! if fuel-bootstrap -v --debug build --target_arch arm64 --activate >>"$bs_build_log" 2>&1; then ++ ret=0 ++ fuel notify --topic "done" --send "${bs_done_message}" ++ else ++*************** + *** 529,534 **** + --- 541,556 ---- + |