diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-06-28 12:56:51 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@172.30.200.206> | 2016-06-28 12:56:51 +0000 |
commit | 1c049bf03ddff1c0b5d4f89a954bf5effe665b59 (patch) | |
tree | b240eb6152bc1090d597b0db500ceb1c5efdb510 /patches/opnfv-fuel/0021-Build-bootstrap-image-for-arm64.patch | |
parent | 4ed37f461040fd97d93079085bf6303aa6f1dffa (diff) | |
parent | 1c5c7e756eba76e4bc2a988c3e4cd7b2a86cec85 (diff) |
Merge "Backport git based patching from Fuel@OPNFV."
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 | 38 |
1 files changed, 13 insertions, 25 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 index 42218ad1..f66777c7 100644 --- a/patches/opnfv-fuel/0021-Build-bootstrap-image-for-arm64.patch +++ b/patches/opnfv-fuel/0021-Build-bootstrap-image-for-arm64.patch @@ -10,30 +10,18 @@ per supported arch. This requires Fuel refactoring. 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 ---- - +@@ -53,3 +53,12 @@ + # Enable iptables + systemctl enable iptables.service ++@@ -484,7 +490,7 @@ ++ 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 +++ 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 + @@ -532,6 +545,16 @@ systemctl start ntpd |