Initial code commit

This brings initial code base for Armband project that allows building
an OPNFV Fuel 8 iso based on Brahmaputra components to be deployed on
arm64 servers.

Signed-off-by: Stanislaw Kardach <kda@semihalf.com>
Signed-off-by: Alexandru Avadanii <alexandru.avadanii@enea.com>
Signed-off-by: Florin Dumitrascu <florin.dumitrascu@enea.com>

JIRA:FUEL-39

8 files changed, 386 insertions, 0 deletions

diff --git a/patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch b/patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch
new file mode 100644
index 00000000..eac38f74
--- /dev/null
+++ b/patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch
@@ -0,0 +1,24 @@
+From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
+Date: Sun, 21 Feb 2016 16:28:02 +0100
+Subject: [PATCH] Allow customizing Fuel commit
+
+---
+ build/config.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build/config.mk b/build/config.mk
+index e11d033..2a81027 100644
+--- a/build/config.mk
++++ b/build/config.mk
+@@ -9,7 +9,7 @@
+ ##############################################################################
+ 
+ FUEL_MAIN_REPO := https://github.com/openstack/fuel-main
+-FUEL_MAIN_TAG = a365f05b903368225da3fea9aa42afc1d50dc9b4
++FUEL_MAIN_TAG :=
+ MOS_VERSION = 8.0
+ OPENSTACK_VERSION = liberty-8.0
+ 
+-- 
+1.9.1
+
diff --git a/patches/opnfv-fuel/0002-Allow-customizing-java-and-fuel-mirror-URLs.patch b/patches/opnfv-fuel/0002-Allow-customizing-java-and-fuel-mirror-URLs.patch
new file mode 100644
index 00000000..4f6e8966
--- /dev/null
+++ b/patches/opnfv-fuel/0002-Allow-customizing-java-and-fuel-mirror-URLs.patch
@@ -0,0 +1,46 @@
+From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
+Date: Wed, 24 Feb 2016 20:02:25 +0100
+Subject: [PATCH] Allow customizing java and fuel-mirror URLs
+
+---
+ build/f_isoroot/f_odlpluginbuild/Makefile | 2 +-
+ build/f_isoroot/f_repobuild/Makefile      | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile
+index f2a47b7..b0bc9c7 100644
+--- a/build/f_isoroot/f_odlpluginbuild/Makefile
++++ b/build/f_isoroot/f_odlpluginbuild/Makefile
+@@ -12,7 +12,7 @@ ODL_BRANCH=brahmaputra-release
+ ODL_REPO="https://github.com/openstack/fuel-plugin-opendaylight.git"
+ 
+ export USE_JAVA8=true
+-export JAVA8_URL=https://launchpad.net/~openjdk-r/+archive/ubuntu/ppa/+files/openjdk-8-jre-headless_8u72-b15-1~trusty1_amd64.deb
++export JAVA8_URL:=https://launchpad.net/~openjdk-r/+archive/ubuntu/ppa/+files/openjdk-8-jre-headless_8u72-b15-1~trusty1_amd64.deb
+ 
+ .PHONY: all
+ all: .odlbuild
+diff --git a/build/f_isoroot/f_repobuild/Makefile b/build/f_isoroot/f_repobuild/Makefile
+index e95dbf2..709ca6b 100644
+--- a/build/f_isoroot/f_repobuild/Makefile
++++ b/build/f_isoroot/f_repobuild/Makefile
+@@ -12,6 +12,7 @@ SHELL := /bin/bash
+ TOP := $(shell pwd)
+ TMP_ROOT_DIR := $(shell echo "$(MIRROR_UBUNTU_ROOT)" | cut -d "/" -f2)
+ # Enable use of exact repo commit if defined, else use Fuel main branch
++FUEL_MIRROR_REPO:=https://github.com/openstack/fuel-mirror
+ FUEL_MIRROR_COMMIT?=$(FUEL_MAIN_TAG)
+ 
+ include ../../config.mk
+@@ -26,7 +27,7 @@ nailgun:
+ 	sudo apt-get install -y git libxml2-dev libxslt-dev python-dev  python-pip libz-dev libyaml-dev createrepo python-yaml
+ 	rm -Rf nailgun
+ 	sudo mkdir -p /var/www/nailgun
+-	git clone https://github.com/openstack/fuel-mirror
++	git clone $(FUEL_MIRROR_REPO)
+ 	cd fuel-mirror && git checkout -q $(FUEL_MIRROR_COMMIT)
+ 	sudo pip install -U -r ./fuel-mirror/requirements.txt
+ 	sudo pip install ./fuel-mirror
+-- 
+1.9.1
+
diff --git a/patches/opnfv-fuel/0003-Add-arm64-deb-repositories-setup.patch b/patches/opnfv-fuel/0003-Add-arm64-deb-repositories-setup.patch
new file mode 100644
index 00000000..9edcd2bb
--- /dev/null
+++ b/patches/opnfv-fuel/0003-Add-arm64-deb-repositories-setup.patch
@@ -0,0 +1,161 @@
+From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
+Date: Wed, 24 Feb 2016 20:04:03 +0100
+Subject: [PATCH] Add arm64 deb repositories setup
+
+---
+ build/f_isoroot/f_kscfg/ks.cfg            |  1 +
+ build/install/apt-ftparchive-deb.conf     |  8 +++++++-
+ build/install/apt-ftparchive-release.conf |  2 +-
+ build/install/apt-ftparchive-udeb.conf    |  7 ++++++-
+ build/install/install.sh                  | 22 ++++++++++++++++++----
+ build/install/uninstall.sh                | 20 +++++++++++---------
+ 6 files changed, 44 insertions(+), 16 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/install/apt-ftparchive-deb.conf b/build/install/apt-ftparchive-deb.conf
+index 0d15aec..e6392f8 100644
+--- a/build/install/apt-ftparchive-deb.conf
++++ b/build/install/apt-ftparchive-deb.conf
+@@ -16,12 +16,18 @@ TreeDefault {
+   Directory "pool";
+ };
+ 
+-BinDirectory "pool/main" {
++BinDirectory "pool/main/binary-amd64" {
+   Packages "dists/trusty/main/binary-amd64/Packages";
+   BinOverride "./indices/override.trusty.main";
+   ExtraOverride "./indices/override.trusty.extra.main";
+ };
+ 
++BinDirectory "pool/main/binary-arm64" {
++  Packages "dists/trusty/main/binary-arm64/Packages";
++  BinOverride "./indices/override.trusty.main";
++  ExtraOverride "./indices/override.trusty.extra.main";
++};
++
+ Default {
+   Packages {
+     Extensions ".deb";
+diff --git a/build/install/apt-ftparchive-release.conf b/build/install/apt-ftparchive-release.conf
+index 02706bd..2838714 100644
+--- a/build/install/apt-ftparchive-release.conf
++++ b/build/install/apt-ftparchive-release.conf
+@@ -13,6 +13,6 @@ APT::FTPArchive::Release::Label "Ubuntu";
+ APT::FTPArchive::Release::Suite "trusty";
+ APT::FTPArchive::Release::Version "1.04";
+ APT::FTPArchive::Release::Codename "trusty";
+-APT::FTPArchive::Release::Architectures "amd64";
++APT::FTPArchive::Release::Architectures "amd64 arm64";
+ APT::FTPArchive::Release::Components "main";
+ APT::FTPArchive::Release::Description "Ubuntu Trusty Tahr 14.04 LTS";
+diff --git a/build/install/apt-ftparchive-udeb.conf b/build/install/apt-ftparchive-udeb.conf
+index 3b5b239..c6ab4fb 100644
+--- a/build/install/apt-ftparchive-udeb.conf
++++ b/build/install/apt-ftparchive-udeb.conf
+@@ -16,11 +16,16 @@ TreeDefault {
+   Directory "pool";
+ };
+ 
+-BinDirectory "pool/debian-installer" {
++BinDirectory "pool/debian-installer/binary-amd64" {
+   Packages "dists/trusty/main/debian-installer/binary-amd64/Packages";
+   BinOverride "./indices/override.trusty.main.debian-installer";
+ };
+ 
++BinDirectory "pool/debian-installer/binary-arm64" {
++  Packages "dists/trusty/main/debian-installer/binary-arm64/Packages";
++  BinOverride "./indices/override.trusty.main.debian-installer";
++};
++
+ Default {
+   Packages {
+     Extensions ".udeb";
+diff --git a/build/install/install.sh b/build/install/install.sh
+index 4e0389e..8c29e08 100755
+--- a/build/install/install.sh
++++ b/build/install/install.sh
+@@ -122,12 +122,24 @@ prep_make_live() {
+     ssh-copy-id root@$FUELHOST
+     sshfs root@1${FUELHOST}:/ $TMP_HOSTMOUNT
+ 
+-    if [ -f  $REPO/dists/trusty/main/binary-amd64/Packages.backup ]; then
++    for arch in arm64 amd64; do
++    if [ -f  $REPO/dists/trusty/main/binary-${arch}/Packages.backup ]; then
++        echo "Error - found backup file for Packages for ${arch}!"
++        exit 1
++    fi
++
++    if [ -f  $REPO/dists/trusty/main/binary-${arch}/Packages.gz.backup ]; then
++        echo "Error - found backup file for Packages.gz for ${arch}!"
++        exit 1
++    fi
++    done
++
++    if [ -f  $REPO/dists/trusty/main/binary-arm64/Packages.backup ]; then
+         echo "Error - found backup file for Packages!"
+         exit 1
+     fi
+ 
+-    if [ -f  $REPO/dists/trusty/main/binary-amd64/Packages.gz.backup ]; then
++    if [ -f  $REPO/dists/trusty/main/binary-arm64/Packages.gz.backup ]; then
+         echo "Error - found backup file for Packages.gz!"
+         exit 1
+     fi
+@@ -142,8 +154,10 @@ prep_make_live() {
+         exit 1
+     fi
+ 
+-    cp $REPO/dists/trusty/main/binary-amd64/Packages $REPO/dists/trusty/main/binary-amd64/Packages.backup
+-    cp $REPO/dists/trusty/main/binary-amd64/Packages.gz $REPO/dists/trusty/main/binary-amd64/Packages.gz.backup
++    for arch in arm64 amd64; do
++        cp $REPO/dists/trusty/main/binary-${arch}/Packages $REPO/dists/trusty/main/binary-${arch}/Packages.backup
++        cp $REPO/dists/trusty/main/binary-${arch}/Packages.gz $REPO/dists/trusty/main/binary-${arch}/Packages.gz.backup
++    done
+     cp $REPO/dists/trusty/Release $REPO/dists/trusty/Release.backup
+     cp -Rvp $DEST/etc/puppet $DEST/etc/puppet.backup
+ }
+diff --git a/build/install/uninstall.sh b/build/install/uninstall.sh
+index a9e74bc..0266e17 100755
+--- a/build/install/uninstall.sh
++++ b/build/install/uninstall.sh
+@@ -31,15 +31,17 @@ DEST=$MOUNT
+ REPO=$DEST/var/www/nailgun/ubuntu/fuelweb/x86_64
+ 
+ cd $REPO
+-if [ ! -f  $REPO/dists/trusty/main/binary-amd64/Packages.backup ]; then
+-    echo "Error - didn't find backup file for Packages!"
+-    exit 1
+-fi
+-
+-if [ ! -f  $REPO/dists/trusty/main/binary-amd64/Packages.gz.backup ]; then
+-    echo "Error - didn't find backup file for Packages.gz!"
+-    exit 1
+-fi
++for arch in arm64 amd64; do
++    if [ ! -f  $REPO/dists/trusty/main/binary-${arch}/Packages.backup ]; then
++        echo "Error - didn't find backup file for Packages for ${arch}!"
++        exit 1
++    fi
++    
++    if [ ! -f  $REPO/dists/trusty/main/binary-${arch}/Packages.gz.backup ]; then
++        echo "Error - didn't find backup file for Packages.gz for ${arch}!"
++        exit 1
++    fi
++done
+ 
+ if [ ! -f  $REPO/dists/trusty/Release.backup ]; then
+     echo "Error - didn't find backup file for Release!"
+-- 
+1.9.1
+
diff --git a/patches/opnfv-fuel/0004-Follow-redirects.patch b/patches/opnfv-fuel/0004-Follow-redirects.patch
new file mode 100644
index 00000000..d056a9e0
--- /dev/null
+++ b/patches/opnfv-fuel/0004-Follow-redirects.patch
@@ -0,0 +1,28 @@
+From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
+Date: Tue, 1 Mar 2016 09:34:57 +0100
+Subject: [PATCH] Follow redirects
+
+---
+ build/Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/build/Makefile b/build/Makefile
+index 01f6e41..61d41ab 100644
+--- a/build/Makefile
++++ b/build/Makefile
+@@ -52,10 +52,10 @@ export MIRROR_UBUNTU_ROOT := $(shell echo -n '/' ; echo "$(MIRROR_UBUNTU_URL)" |
+ export LATEST_MIRROR_ID_URL := http://$(shell ./select_closest_fuel_mirror.py)
+ 
+ export MIRROR_MOS_UBUNTU := $(shell echo "$(LATEST_MIRROR_ID_URL)" | cut -d'/' -f3)
+-export LATEST_TARGET_UBUNTU := $(shell curl -sSf "$(MIRROR_MOS_UBUNTU)/mos-repos/ubuntu/8.0.target.txt" | head -1)
++export LATEST_TARGET_UBUNTU := $(shell curl -sSfL "$(MIRROR_MOS_UBUNTU)/mos-repos/ubuntu/8.0.target.txt" | head -1)
+ export MIRROR_MOS_UBUNTU_ROOT := /mos-repos/ubuntu/$(LATEST_TARGET_UBUNTU)
+ 
+-export LATEST_TARGET_CENTOS := $(shell curl -sSf "$(LATEST_MIRROR_ID_URL)/mos-repos/centos/mos8.0-centos7-fuel/os.target.txt" | head -1)
++export LATEST_TARGET_CENTOS := $(shell curl -sSfL "$(LATEST_MIRROR_ID_URL)/mos-repos/centos/mos8.0-centos7-fuel/os.target.txt" | head -1)
+ export MIRROR_FUEL := "$(LATEST_MIRROR_ID_URL)/mos-repos/centos/mos8.0-centos7-fuel/$(LATEST_TARGET_CENTOS)/x86_64"
+ 
+ # uncomment and use: make print-VARIABLE
+-- 
+1.9.1
+
diff --git a/patches/opnfv-fuel/0005-Build-bootstrap-image-for-arm64.patch b/patches/opnfv-fuel/0005-Build-bootstrap-image-for-arm64.patch
new file mode 100644
index 00000000..c6820393
--- /dev/null
+++ b/patches/opnfv-fuel/0005-Build-bootstrap-image-for-arm64.patch
@@ -0,0 +1,27 @@
+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/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
+-- 
+1.9.1
+
diff --git a/patches/opnfv-fuel/0006-bootstrap-Use-public-Ubuntu-ports-mirrors.patch b/patches/opnfv-fuel/0006-bootstrap-Use-public-Ubuntu-ports-mirrors.patch
new file mode 100644
index 00000000..253267d1
--- /dev/null
+++ b/patches/opnfv-fuel/0006-bootstrap-Use-public-Ubuntu-ports-mirrors.patch
@@ -0,0 +1,51 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Thu, 3 Mar 2016 19:18:27 +0100
+Subject: [PATCH] bootstrap: Use public Ubuntu-ports mirrors.
+
+Instead of relying on 127.0.0.1 partial Ubuntu mirror, use
+public archives.
+While doing so, switch to Ubuntu-ports, enabling  building arm64
+bootstraps.
+
+NOTE: This disables the abillity to build amd64 bootstraps with
+current config.
+---
+ build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
+index aa12c45..2e4843d 100644
+--- a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
++++ b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml
+@@ -36,19 +36,19 @@
+   repos:
+     - name: ubuntu
+       section: "main universe multiverse"
+-      uri: "http://127.0.0.1:8080/mirrors/ubuntu"
++      uri: "http://ports.ubuntu.com/ubuntu-ports"
+       priority:
+       suite: trusty
+       type: deb
+     - name: ubuntu-updates
+       section: "main universe multiverse"
+-      uri: "http://127.0.0.1:8080/mirrors/ubuntu"
++      uri: "http://ports.ubuntu.com/ubuntu-ports"
+       priority:
+       suite: trusty-updates
+       type: deb
+     - name: ubuntu-security
+       section: "main universe multiverse"
+-      uri: "http://127.0.0.1:8080/mirrors/ubuntu"
++      uri: "http://ports.ubuntu.com/ubuntu-ports"
+       priority:
+       suite: trusty-security
+       type: deb
+@@ -60,4 +60,5 @@
+       type: deb
+   skip_default_img_build: true
+   direct_repo_addresses:
++    - "ports.ubuntu.com"
+     - "127.0.0.1"
+-- 
+1.9.1
+
diff --git a/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-qemu.patch b/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-qemu.patch
new file mode 100644
index 00000000..130c354d
--- /dev/null
+++ b/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-qemu.patch
@@ -0,0 +1,24 @@
+From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
+Date: Fri, 4 Mar 2016 14:27:48 +0100
+Subject: [PATCH] Allow customizing fuel-plugin-qemu
+
+---
+ build/f_isoroot/f_qemupluginbuild/config.mk | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/build/f_isoroot/f_qemupluginbuild/config.mk b/build/f_isoroot/f_qemupluginbuild/config.mk
+index e9c4356..c23e9c2 100644
+--- a/build/f_isoroot/f_qemupluginbuild/config.mk
++++ b/build/f_isoroot/f_qemupluginbuild/config.mk
+@@ -7,6 +7,6 @@
+ # http://www.apache.org/licenses/LICENSE-2.0
+ ##############################################################################
+ 
+-QEMU_BRANCH=292b588b5fe444651cca92d7511383ac42253984
+-QEMU_REPO=https://review.openstack.org/openstack/fuel-plugin-qemu
++QEMU_BRANCH:=292b588b5fe444651cca92d7511383ac42253984
++QEMU_REPO:=https://review.openstack.org/openstack/fuel-plugin-qemu
+ QEMU_CHANGE=
+-- 
+1.9.1
+
diff --git a/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-ovsnfv.patch b/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-ovsnfv.patch
new file mode 100644
index 00000000..dde9c5a0
--- /dev/null
+++ b/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-ovsnfv.patch
@@ -0,0 +1,25 @@
+From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
+Date: Sat, 5 Mar 2016 15:08:10 +0100
+Subject: [PATCH] Allow customizing fuel-plugin-ovsnfv
+
+---
+ build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk
+index 1893fce..f29dab5 100644
+--- a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk
++++ b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk
+@@ -7,7 +7,7 @@
+ # http://www.apache.org/licenses/LICENSE-2.0
+ ##############################################################################
+ 
+-OVSNFV_DPDK_BRANCH=stable/brahmaputra
+-OVSNFV_DPDK_REPO=https://gerrit.opnfv.org/gerrit/p/ovsnfv.git
++OVSNFV_DPDK_BRANCH:=stable/brahmaputra
++OVSNFV_DPDK_REPO:=https://gerrit.opnfv.org/gerrit/p/ovsnfv.git
+ OVSNFV_DPDK_DIR=fuel-plugin-ovsnfv
+ OVSNFV_DPDK_CHANGE=
+-- 
+1.9.1
+