Merge "Rebase: Sync after Build system uplift to Fuel 9.0"

4 files changed, 85 insertions, 49 deletions

diff --git a/patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch b/patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch
index 568f6602..cf962502 100644
--- a/patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch
+++ b/patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch
@@ -14,8 +14,8 @@ index 667575c..30d9ccc 100644
  ##############################################################################
  
  FUEL_MAIN_REPO := https://github.com/openstack/fuel-main
--FUEL_MAIN_TAG = stable/8.0
-+FUEL_MAIN_TAG := stable/8.0
- MOS_VERSION = 8.0
- OPENSTACK_VERSION = liberty-8.0
+-FUEL_MAIN_TAG = 9.0
++FUEL_MAIN_TAG := 9.0
+ MOS_VERSION = 9.0
+ OPENSTACK_VERSION = mitaka-9.0
  
diff --git a/patches/opnfv-fuel/0003-Add-arm64-deb-repositories-setup.patch b/patches/opnfv-fuel/0003-Add-arm64-deb-repositories-setup.patch
index 22396768..8b2dd534 100644
--- a/patches/opnfv-fuel/0003-Add-arm64-deb-repositories-setup.patch
+++ b/patches/opnfv-fuel/0003-Add-arm64-deb-repositories-setup.patch
@@ -11,18 +11,27 @@ Subject: [PATCH] Add arm64 deb repositories setup
  build/install/uninstall.sh                | 18 ++++++++++--------
  6 files changed, 43 insertions(+), 15 deletions(-)
 
-diff --git a/build/f_isoroot/f_kscfg/ks.cfg b/build/f_isoroot/f_kscfg/ks.cfg
-index c93babe..30bad1d 100644
---- a/build/f_isoroot/f_kscfg/ks.cfg
-+++ b/build/f_isoroot/f_kscfg/ks.cfg
-@@ -448,6 +448,7 @@ cp -r ${SOURCE}/extra-repos ${repodir}/
- cp ${SOURCE}/.treeinfo ${repodir}/centos/x86_64
- 
- # Copying Ubuntu files
-+# FIXME: This is missleading as dist/pool may contain multiple arch!
- mkdir -p ${repodir}/ubuntu/x86_64/images
- cp -r ${SOURCE}/ubuntu/dists ${repodir}/ubuntu/x86_64
- cp -r ${SOURCE}/ubuntu/pool ${repodir}/ubuntu/x86_64
+diff --git a/build/f_isoroot/f_kscfg/ks.cfg.patch b/build/f_isoroot/f_kscfg/ks.cfg.patch
+index a6840e4..e1ae8fc 100644
+--- a/build/f_isoroot/f_kscfg/ks.cfg.patch
++++ b/build/f_isoroot/f_kscfg/ks.cfg.patch
+@@ -1,6 +1,16 @@
+ *** /dev/null	2016-04-26 10:10:11.481587709 +0200
+ --- ks.cfg	2016-04-26 10:10:11.481587709 +0200
+ ***************
++*** 448,453 ****
++--- 448,454 ----
++  cp ${SOURCE}/.treeinfo ${repodir}/centos/x86_64
++  
++  # Copying Ubuntu files
+++ # FIXME: This is missleading as dist/pool may contain multiple arch!
++  mkdir -p ${repodir}/ubuntu/x86_64/images
++  cp -r ${SOURCE}/ubuntu/dists ${repodir}/ubuntu/x86_64
++  cp -r ${SOURCE}/ubuntu/pool ${repodir}/ubuntu/x86_64
++***************
+ *** 579,584 ****
+ --- 579,592 ----
+   
 diff --git a/build/install/apt-ftparchive-deb.conf b/build/install/apt-ftparchive-deb.conf
 index 0d15aec..e6392f8 100644
 --- a/build/install/apt-ftparchive-deb.conf
diff --git a/patches/opnfv-fuel/0004-Build-bootstrap-image-for-arm64.patch b/patches/opnfv-fuel/0004-Build-bootstrap-image-for-arm64.patch
index 1ec568be..454cef68 100644
--- a/patches/opnfv-fuel/0004-Build-bootstrap-image-for-arm64.patch
+++ b/patches/opnfv-fuel/0004-Build-bootstrap-image-for-arm64.patch
@@ -9,16 +9,29 @@ per supported arch. This requires Fuel refactoring.
  build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh b/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh
-index b096a78..744f352 100755
---- a/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh
-+++ b/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh
-@@ -325,7 +325,7 @@ build_ubuntu_bootstrap () {
-         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
+--- 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 ----
+   
diff --git a/patches/opnfv-fuel/0029-UX-Update-bootstrap-target-build-time-estimate.patch b/patches/opnfv-fuel/0029-UX-Update-bootstrap-target-build-time-estimate.patch
index 9791f595..4eefbc1d 100644
--- a/patches/opnfv-fuel/0029-UX-Update-bootstrap-target-build-time-estimate.patch
+++ b/patches/opnfv-fuel/0029-UX-Update-bootstrap-target-build-time-estimate.patch
@@ -11,23 +11,37 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh | 9 ++++++---
  1 file changed, 6 insertions(+), 3 deletions(-)
 
-diff --git a/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh b/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh
-index 744f352..7395af3 100755
---- a/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh
-+++ b/build/f_isoroot/f_bootstrap/bootstrap_admin_node.sh
-@@ -29,9 +29,12 @@ and added to cluster. \
- For more information please visit \
- https://docs.mirantis.com/openstack/fuel/fuel-master/"
- bs_progress_message="There is no active bootstrap. Bootstrap image building \
--is in progress. Usually it takes 15-20 minutes. It depends on your internet \
--connection and hardware performance. Please reboot failed to discover nodes \
--after bootstrap image become available."
-+is in progress. Usually it takes 15-20 minutes for a native build (x86_64) \
-+and/or 30-45 minutes for each cross-build (e.g. AArch64). \
-+It depends on your internet connection, hardware performance and selected \
-+bootstrap architecture(s). This ISO supports AArch64 only. Please reboot \
-+failed to discover nodes after bootstrap image become available."
-+
- bs_done_message="Default bootstrap image building done. Now you can boot new \
- nodes over PXE, they will be discovered and become available for installing \
- OpenStack on them"
+diff --git a/build/bootstrap_admin_node.sh.patch b/build/bootstrap_admin_node.sh.patch
+index c66b497..46b53e6 100644
+--- a/build/bootstrap_admin_node.sh.patch
++++ b/build/bootstrap_admin_node.sh.patch
+@@ -1,6 +1,29 @@
+ *** bootstrap_admin_node.sh.orig	Mon May 30 06:31:38 2016
+ --- bootstrap_admin_node.sh	Mon May 30 06:35:11 2016
+ ***************
++*** 86,94 ****
++  http://docs.openstack.org/developer/fuel-docs/userdocs/fuel-install-guide/bootstrap/\
++  bootstrap_troubleshoot.html"
++  bs_progress_message="There is no active bootstrap. Bootstrap image building \
++! is in progress. Usually it takes 15-20 minutes. It depends on your internet \
++! connection and hardware performance. After bootstrap image becomes available, \
++! reboot nodes that failed to be discovered."
++  bs_done_message="Default bootstrap image building done. Now you can boot new \
++  nodes over PXE, they will be discovered and become available for installing \
++  OpenStack on them"
++--- 86,96 ----
++  http://docs.openstack.org/developer/fuel-docs/userdocs/fuel-install-guide/bootstrap/\
++  bootstrap_troubleshoot.html"
++  bs_progress_message="There is no active bootstrap. Bootstrap image building \
++! is in progress. Usually it takes 15-20 minutes for a native build (x86_64) \
++! and/or 30-45 minutes for each cross-build (e.g. AArch64). \
++! It depends on your internet connection, hardware performance and selected \
++! bootstrap architecture(s). This ISO supports AArch64 only. After bootstrap \
++! image becomes available, reboot nodes that failed to be discovered."
++  bs_done_message="Default bootstrap image building done. Now you can boot new \
++  nodes over PXE, they will be discovered and become available for installing \
++  OpenStack on them"
++***************
+ *** 339,346 ****
+   set +x
+   echo "Done!"