aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules4
-rw-r--r--Makefile17
-rw-r--r--TODO.md57
-rw-r--r--patches/fuel-agent/0001-Use-qemu-debootstrap-for-image-creation.patch3
-rw-r--r--patches/fuel-agent/0002-Add-FLASH_KERNEL_SKIP-true.patch3
-rw-r--r--patches/fuel-agent/0003-Fix-qemu-user-static-replacement.patch3
-rw-r--r--patches/fuel-agent/0004-Prevent-common-cross-debootstrap-newaliases-issue.patch3
-rw-r--r--patches/fuel-agent/0005-FIXME-s-grub-pc-grub-efi-arm64.patch3
-rw-r--r--patches/fuel-agent/0006-Add-esp-partition-flag.patch3
-rw-r--r--patches/fuel-agent/0007-Add-fs-for-efi-partition.patch42
-rw-r--r--patches/fuel-agent/0008-bootstrap-Use-gzip-instead-of-xz-compression.patch35
-rw-r--r--patches/fuel-library/0001-Add-arm64-templates-to-cobbler-and-nailgun.patch15
-rw-r--r--patches/fuel-library/0002-Add-arm64-for-auxiliary-repos.patch3
-rw-r--r--patches/fuel-library/0003-Make-qemu-kvm-architecture-aware.patch9
-rw-r--r--patches/fuel-library/0004-Make-TestVM-creation-architecture-aware.patch33
-rw-r--r--patches/fuel-library/0005-Disable-usb-tablet-for-aarch64.patch38
-rw-r--r--patches/fuel-library/0006-direct-kernel-boot-for-cirros.patch138
-rw-r--r--patches/fuel-library/0007-m1.micro-Increase-profile-RAM-size-to-128MB.patch37
-rw-r--r--patches/fuel-main/0001-Use-qemu-debootstrap-to-support-multi-arch.patch3
-rw-r--r--patches/fuel-main/0002-Allow-multi-arch-debian-mirrors.patch3
-rw-r--r--patches/fuel-main/0003-Follow-redirects.patch3
-rw-r--r--patches/fuel-main/0004-Add-apt-https-support-package-to-sandbox.patch3
-rw-r--r--patches/fuel-main/0005-Make-cpio-accept-symlinks.patch3
-rw-r--r--patches/fuel-main/0006-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch3
-rw-r--r--patches/fuel-mirror/0001-Set-mos-ubuntu-base-URL-to-linux.enea.com.patch7
-rw-r--r--patches/fuel-mirror/0002-Add-fuel-agent-dependencies-to-Ubuntu-mirror.patch5
-rw-r--r--patches/fuel-plugin-opendaylight/0001-arm64-support-for-OpenDaylight-Fuel-Plugin.patch378
-rw-r--r--patches/fuel-plugin-ovsnfv/0001-fuel-plugin-Pick-updated-numa.-packages.patch3
-rw-r--r--patches/fuel-plugin-qemu/0001-Fix-apt-cache-and-qemu-version-handling.patch3
-rw-r--r--patches/fuel-web/0001-Add-arm64-fixture.patch11
-rw-r--r--patches/fuel-web/0002-Add-arch-to-nailgun-release-and-target-image.patch110
-rw-r--r--patches/fuel-web/0003-Update-docs-for-qemu-debootstrap.patch3
-rw-r--r--patches/fuel-web/0004-direct-kernel-boot-for-cirros.patch138
-rw-r--r--patches/fuel-web/0005-FIXME-Disable-amd64-Liberty-on-Ubuntu-for-now.patch24
-rw-r--r--patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch3
-rw-r--r--patches/opnfv-fuel/0002-Allow-customizing-java-and-fuel-mirror-URLs.patch3
-rw-r--r--patches/opnfv-fuel/0003-Add-arm64-deb-repositories-setup.patch3
-rw-r--r--patches/opnfv-fuel/0004-Follow-redirects.patch3
-rw-r--r--patches/opnfv-fuel/0005-Build-bootstrap-image-for-arm64.patch3
-rw-r--r--patches/opnfv-fuel/0006-bootstrap-Use-public-Ubuntu-ports-mirrors.patch3
-rw-r--r--patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-qemu.patch3
-rw-r--r--patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-ovsnfv.patch3
-rw-r--r--patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch24
-rw-r--r--upstream/fuel-plugin-opendaylight1
44 files changed, 1033 insertions, 162 deletions
diff --git a/.gitmodules b/.gitmodules
index 50c109b3..d5ab1033 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -30,3 +30,7 @@
path = upstream/fuel-plugin-ovsnfv
url = https://gerrit.opnfv.org/gerrit/p/ovsnfv.git
branch = stable/brahmaputra
+[submodule "fuel-plugin-opendaylight"]
+ path = upstream/fuel-plugin-opendaylight
+ url = https://github.com/openstack/fuel-plugin-opendaylight.git
+ branch = brahmaputra-release
diff --git a/Makefile b/Makefile
index 34bfde7a..294a8861 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,8 @@ submodules-clean:
patches-export:
@git submodule -q foreach 'mkdir -p ${root}/patches/$$name'
@git submodule -q foreach 'git format-patch \
- -o ${root}/patches/$$name -N armband-workbench-root'
+ -o ${root}/patches/$$name -N armband-workbench-root \
+ --no-signature'
@find ${root}/patches -name '*.patch' -exec sed -i -e '1d' {} \;
# apply patches from patches/* to respective submodules
@@ -33,6 +34,18 @@ patches-import:
'for p in $$(ls ${root}/patches/$$name/); do \
git am ${root}/patches/$$name/$$p; \
done'
+clean-docker:
+ docker stop FUEL_CENTOS_8.0 || true
+ docker rm $(docker ps -a -q) || true
+ docker rmi -f $(docker images -q) || true
+
+clean-build:
+ sudo rm -rf /tmp/fuel-main
+ git -C ${root}/upstream/fuel reset --hard HEAD
+ git -C ${root}/upstream/fuel clean -xdff
+
+release: export LC_ALL=en_US.UTF-8
+release: submodules-clean clean-docker clean-build submodules-init patches-import build
build:
cd ${root}/upstream/fuel/build && \
@@ -48,12 +61,14 @@ build:
FUEL_MIRROR_REPO=${root}/upstream/fuel-mirror \
QEMU_REPO=${root}/upstream/fuel-plugin-qemu \
OVSNFV_DPDK_REPO=${root}/upstream/fuel-plugin-ovsnfv \
+ ODL_REPO=${root}/upstream/fuel-plugin-opendaylight \
FUELLIB_COMMIT=HEAD \
NAILGUN_COMMIT=HEAD \
FUEL_AGENT_COMMIT=HEAD \
FUEL_MIRROR_COMMIT=HEAD \
QEMU_BRANCH=HEAD \
OVSNFV_DPDK_BRANCH=armband-workbench \
+ ODL_BRANCH=armband-workbench \
PRODUCT_VERSION=8.0 \
PRODUCT_NAME=mos \
CENTOS_MAJOR=7 \
diff --git a/TODO.md b/TODO.md
index 8f3a3302..75d875f6 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,28 +1,53 @@
List of missing features and things to do
=========================================
-* Extend arch list for auxiliary repo on fuel master (e.g. "amd64 arm64", or "arm64" if people want to support arm64 only).
-* Add Armband CentOS repository either as URL override.
-* [arm64-master] Add arm64 support for CentOS based actions.
-* [arm64-master] change docker repo in `upstream/fuel/build/config.mk`, perhaps by figuring out current architecture with `uname -m`
+Needed for arm64 deployment (mandatory)
+=========================================
+* [arm64-master] ODL plugin
+* [arm64-master] QEMU 2.5 for Ubuntu (in progress)
+
+Nice to have, should be fixed before rel
+=========================================
+* [fuel?] Disabling rx-vlan-filter from Fuel WebUI is not applied during netcheck
+* [thunderx] rtc-efi disable
+
+Cleanup tasks
+=========================================
+* [armband-rpm-repo] Armband CentOS repository as additional repo (x86_64)
+* [armband-deb-repo] Backport mysql/galera patches to B release versions
* [arm64-master] Find `puppetlabs-products` repo for arm64.
* [arm64-master] Fix license in ubuntu_1404_arm64.pp
-* [arm64-master] Remove/replace mini.iso with own kernel/initrd
* [arm64-master] Look into default ubuntu_debootstrap change in cobbler.pp
-* [arm64-master] Add Cobbler aarch64 loader
+* [arm64-master] [fuel-agent] Package and repo update for arm64 in [2] (?)
+* [fuel] Add QEMU_VERSION for fuel-plugin-qemu
+* [ohai] ThunderX network card speed reported as N/A
+* [arm64-master] change docker repo in `upstream/fuel/build/config.mk`,
+ perhaps by figuring out current architecture with `uname -m`
+* [arm64-master] Fuel Master YUM repos still point to mirror.fuel-infra.org,
+ due to bootstrap_admin_node.sh hardcodes from OPNFV
+
+Needed for all arch support (todo, later)
+=========================================
+* [arm64-master] Extend arch list for auxiliary repo on fuel master
+ (e.g. "amd64 arm64", or "arm64" if people want to support arm64 only).
+ Use UBUNTU_ARCH in constructs like "for arch in arm64 amd64; do"
* [arm64-master] [fuel-agent] Custom package selection for arm64 in [1] or from above
+* [arm64-master] Stop hardcoding grub-efi-arm64/grub-pc
+* [fuel-main] deb/rpm building for arm64 support
+* [fuel-main] mirror arm64 support
+* [fuel] Figure a way for not hardcoding the bootstrap image architecture,
+ preferably selectable using fuel-menu
+
+Needed for aarch64 Fuel Master support
+=========================================
+* [arm64-master] Add arm64 support for CentOS based actions.
+
+No longer needed
+=========================================
* [arm64-master] [fuel-agent] --kernel-flavor override in fuel_bootstrap based on arch [2]
-* [arm64-master] [fuel-agent] Package and repo update for arm64 in [3] (?)
-* [arm64-master] [fuel-agent] (?) Update image build tests for arm64 in [4] (+efi?)
* [arm64-master] Factor out 10.0.2.6 local mirrors and switch to HTTPS for MOS mirror
-* [armband-deb-repo] Re-compile mixed-binaries (all+arch) debs for amd64 (e.g. ceph)
-* [ohai] ThunderX network card speed reported as N/A
-* [fuel?] Disabling rx-vlan-filter from Fuel WebUI is not applied during netcheck
* [fuel?] Gray out vCenter & co for archs other than x86
-* [fuel] Figure a way for not hardcoding the bootstrap image architecture
-* [fuel] Add QEMU_VERSION for fuel-plugin-qemu
+ vCenter is automatically disabled for aarch64 now
[1] https://github.com/openstack/fuel-agent/blob/master/fuel_agent/drivers/nailgun.py#L687-L693
-[2] https://github.com/openstack/fuel-agent/blob/master/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/commands/build.py#L107
-[3] https://github.com/openstack/fuel-agent/blob/master/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/settings.yaml.sample#L19
-[4] https://github.com/openstack/fuel-agent/blob/master/fuel_agent/tests/test_nailgun_build_image.py#L26
+[2] https://github.com/openstack/fuel-agent/blob/master/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/settings.yaml.sample#L19
diff --git a/patches/fuel-agent/0001-Use-qemu-debootstrap-for-image-creation.patch b/patches/fuel-agent/0001-Use-qemu-debootstrap-for-image-creation.patch
index 28ef2cff..e5e76c79 100644
--- a/patches/fuel-agent/0001-Use-qemu-debootstrap-for-image-creation.patch
+++ b/patches/fuel-agent/0001-Use-qemu-debootstrap-for-image-creation.patch
@@ -155,6 +155,3 @@ index 5c37600..a43f693 100644
Requires: xz
Requires: coreutils
Requires: psmisc
---
-1.9.1
-
diff --git a/patches/fuel-agent/0002-Add-FLASH_KERNEL_SKIP-true.patch b/patches/fuel-agent/0002-Add-FLASH_KERNEL_SKIP-true.patch
index 260651c5..0c2f2ac9 100644
--- a/patches/fuel-agent/0002-Add-FLASH_KERNEL_SKIP-true.patch
+++ b/patches/fuel-agent/0002-Add-FLASH_KERNEL_SKIP-true.patch
@@ -19,6 +19,3 @@ index af41b2b..6f31732 100644
os.environ['LC_ALL'] = os.environ['LANG'] = os.environ['LANGUAGE'] = 'C'
---
-1.9.1
-
diff --git a/patches/fuel-agent/0003-Fix-qemu-user-static-replacement.patch b/patches/fuel-agent/0003-Fix-qemu-user-static-replacement.patch
index 1ea93ba3..a4f65d68 100644
--- a/patches/fuel-agent/0003-Fix-qemu-user-static-replacement.patch
+++ b/patches/fuel-agent/0003-Fix-qemu-user-static-replacement.patch
@@ -53,6 +53,3 @@ index 6f31732..abd762e 100644
def create_sparse_tmp_file(dir, suffix, size=8192):
"""Creates sparse file.
---
-1.9.1
-
diff --git a/patches/fuel-agent/0004-Prevent-common-cross-debootstrap-newaliases-issue.patch b/patches/fuel-agent/0004-Prevent-common-cross-debootstrap-newaliases-issue.patch
index 1d044585..7f6d2c3d 100644
--- a/patches/fuel-agent/0004-Prevent-common-cross-debootstrap-newaliases-issue.patch
+++ b/patches/fuel-agent/0004-Prevent-common-cross-debootstrap-newaliases-issue.patch
@@ -100,6 +100,3 @@ index abd762e..e11ceba 100644
def create_sparse_tmp_file(dir, suffix, size=8192):
"""Creates sparse file.
---
-1.9.1
-
diff --git a/patches/fuel-agent/0005-FIXME-s-grub-pc-grub-efi-arm64.patch b/patches/fuel-agent/0005-FIXME-s-grub-pc-grub-efi-arm64.patch
index 59fe0180..a9d3d5bf 100644
--- a/patches/fuel-agent/0005-FIXME-s-grub-pc-grub-efi-arm64.patch
+++ b/patches/fuel-agent/0005-FIXME-s-grub-pc-grub-efi-arm64.patch
@@ -26,6 +26,3 @@ index c2fef69..3807ca7 100644
"hpsa-dkms",
"i40e-dkms",
"linux-firmware",
---
-1.9.1
-
diff --git a/patches/fuel-agent/0006-Add-esp-partition-flag.patch b/patches/fuel-agent/0006-Add-esp-partition-flag.patch
index e180468f..a1990565 100644
--- a/patches/fuel-agent/0006-Add-esp-partition-flag.patch
+++ b/patches/fuel-agent/0006-Add-esp-partition-flag.patch
@@ -46,6 +46,3 @@ index acdd0b3..86349d2 100644
raise errors.WrongPartitionSchemeError(
'Unsupported partition flag: %s' % flag)
if state not in ('on', 'off'):
---
-1.9.1
-
diff --git a/patches/fuel-agent/0007-Add-fs-for-efi-partition.patch b/patches/fuel-agent/0007-Add-fs-for-efi-partition.patch
index 573ec133..dbbde129 100644
--- a/patches/fuel-agent/0007-Add-fs-for-efi-partition.patch
+++ b/patches/fuel-agent/0007-Add-fs-for-efi-partition.patch
@@ -3,10 +3,10 @@ Date: Tue, 8 Mar 2016 21:08:55 +0100
Subject: [PATCH] Add fs for efi partition
---
- debian/control | 1 +
- fuel_agent/drivers/nailgun.py | 4 +++-
- specs/fuel-agent.spec | 1 +
- 3 files changed, 5 insertions(+), 1 deletion(-)
+ debian/control | 1 +
+ fuel_agent/drivers/nailgun.py | 13 ++++++++++---
+ specs/fuel-agent.spec | 1 +
+ 3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/debian/control b/debian/control
index 189dc00..acfda35 100644
@@ -21,17 +21,34 @@ index 189dc00..acfda35 100644
gdisk,
genisoimage,
diff --git a/fuel_agent/drivers/nailgun.py b/fuel_agent/drivers/nailgun.py
-index bc532b4..24d0d64 100644
+index bc532b4..f092865 100644
--- a/fuel_agent/drivers/nailgun.py
+++ b/fuel_agent/drivers/nailgun.py
-@@ -324,7 +324,9 @@ class Nailgun(BaseDataDriver):
- # uefi partition (for future use)
- LOG.debug('Adding UEFI partition on disk %s: size=200' %
+@@ -81,6 +81,9 @@ class Nailgun(BaseDataDriver):
+ # was already allocated on first matching volume
+ # or not
+ self._boot_partition_done = False
++ # this var states whether ESP partition was already
++ # allocated on the first matching volume or not
++ self._esp_partition_done = False
+ # this var is used as a flag that /boot fs
+ # has already been added. we need this to
+ # get rid of md over all disks for /boot partition.
+@@ -321,10 +324,14 @@ class Nailgun(BaseDataDriver):
+ LOG.debug('Adding bios_grub partition on disk %s: size=24' %
+ disk['name'])
+ parted.add_partition(size=24, flags=['bios_grub'])
+- # uefi partition (for future use)
+- LOG.debug('Adding UEFI partition on disk %s: size=200' %
++ # uefi partition - added only once.
++ if self._is_boot_disk(disk) and not self._esp_partition_done:
++ LOG.debug('Adding UEFI partition on disk %s: size=200' %
disk['name'])
- parted.add_partition(size=200, flags=['esp'])
-+ prt = parted.add_partition(size=200, flags=['esp'])
-+ partition_scheme.add_fs(device=prt.name, mount='/boot/efi',
-+ fs_type='vfat')
++ prt = parted.add_partition(size=200, flags=['esp'])
++ partition_scheme.add_fs(device=prt.name, mount='/boot/efi',
++ fs_type='vfat')
++ self._esp_partition_done = True
LOG.debug('Looping over all volumes on disk %s' % disk['name'])
for volume in disk['volumes']:
@@ -47,6 +64,3 @@ index a43f693..c2b9b51 100644
Requires: dpkg
Requires: qemu-user-static
Requires: xz
---
-1.9.1
-
diff --git a/patches/fuel-agent/0008-bootstrap-Use-gzip-instead-of-xz-compression.patch b/patches/fuel-agent/0008-bootstrap-Use-gzip-instead-of-xz-compression.patch
new file mode 100644
index 00000000..19176c90
--- /dev/null
+++ b/patches/fuel-agent/0008-bootstrap-Use-gzip-instead-of-xz-compression.patch
@@ -0,0 +1,35 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Wed, 9 Mar 2016 23:02:17 +0100
+Subject: [PATCH] bootstrap: Use gzip instead of xz compression.
+
+bootstrap mksquashfs using qemu-user-static is extremely slow,
+taking up to one hour. gzip, on the other hand, is reasonably fast.
+According to [1], xz is slower, with not much size gain.
+
+[1] https://jonathancarter.org/2015/04/06/squashfs-performance-testing/
+---
+ contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/consts.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/consts.py b/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/consts.py
+index d507156..688197d 100644
+--- a/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/consts.py
++++ b/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/consts.py
+@@ -24,7 +24,7 @@ COMPRESSED_CONTAINER_FORMAT = "tar.gz"
+ UNCOMPRESSED_CONTAINER_FORMAT = "directory"
+ ROOTFS = {'name': 'rootfs',
+ 'mask': 'rootfs',
+- 'compress_format': 'xz',
++ 'compress_format': 'gzip',
+ 'uri': 'http://127.0.0.1:8080/bootstraps/{uuid}/root.squashfs',
+ 'format': 'ext4',
+ 'container': 'raw'}
+@@ -34,7 +34,7 @@ BOOTSTRAP_MODULES = [
+ 'uri': 'http://127.0.0.1:8080/bootstraps/{uuid}/vmlinuz'},
+ {'name': 'initrd',
+ 'mask': 'initrd',
+- 'compress_format': 'xz',
++ 'compress_format': 'gzip',
+ 'uri': 'http://127.0.0.1:8080/bootstraps/{uuid}/initrd.img'},
+ ROOTFS
+ ]
diff --git a/patches/fuel-library/0001-Add-arm64-templates-to-cobbler-and-nailgun.patch b/patches/fuel-library/0001-Add-arm64-templates-to-cobbler-and-nailgun.patch
index 56796d48..d8a6a03d 100644
--- a/patches/fuel-library/0001-Add-arm64-templates-to-cobbler-and-nailgun.patch
+++ b/patches/fuel-library/0001-Add-arm64-templates-to-cobbler-and-nailgun.patch
@@ -9,13 +9,13 @@ Add arm64 templates to cobbler and nailgun
deployment/puppet/cobbler/manifests/server.pp | 27 +++++++++++++++
.../puppet/cobbler/templates/dnsmasq.template.erb | 2 ++
.../cobbler/templates/efidefault.template.erb | 5 +++
- .../cobbler/templates/grubprofile.template.erb | 16 +++++++++
+ .../cobbler/templates/grubprofile.template.erb | 12 +++++++
.../cobbler/templates/grubsystem.template.erb | 16 +++++++++
.../templates/preseed/ubuntu-1404.preseed.erb | 2 ++
.../puppet/nailgun/manifests/auxiliaryrepos.pp | 12 ++++---
deployment/puppet/nailgun/manifests/cobbler.pp | 38 +++++++++++++++++-----
.../puppet/nailgun/manifests/cobbler/preseed.pp | 13 ++++++++
- 9 files changed, 119 insertions(+), 12 deletions(-)
+ 9 files changed, 115 insertions(+), 12 deletions(-)
create mode 100644 deployment/puppet/cobbler/templates/efidefault.template.erb
create mode 100644 deployment/puppet/cobbler/templates/grubprofile.template.erb
create mode 100644 deployment/puppet/cobbler/templates/grubsystem.template.erb
@@ -84,14 +84,10 @@ index 0000000..af09eb8
+$grub_menu_items
diff --git a/deployment/puppet/cobbler/templates/grubprofile.template.erb b/deployment/puppet/cobbler/templates/grubprofile.template.erb
new file mode 100644
-index 0000000..9a191bc
+index 0000000..eb7557c
--- /dev/null
+++ b/deployment/puppet/cobbler/templates/grubprofile.template.erb
-@@ -0,0 +1,16 @@
-+set default=1
-+set timeout=5
-+tr -s ipxe_mac ':' '-' $net_default_mac
-+
+@@ -0,0 +1,12 @@
+menuentry '$profile_name' {
+ echo 'Network status:'
+ net_ls_cards
@@ -268,6 +264,3 @@ index 0000000..93c71ba
+ require => Class['::cobbler::server'],
+ }
+}
---
-1.9.1
-
diff --git a/patches/fuel-library/0002-Add-arm64-for-auxiliary-repos.patch b/patches/fuel-library/0002-Add-arm64-for-auxiliary-repos.patch
index 0bf54a2c..591d3968 100644
--- a/patches/fuel-library/0002-Add-arm64-for-auxiliary-repos.patch
+++ b/patches/fuel-library/0002-Add-arm64-for-auxiliary-repos.patch
@@ -34,6 +34,3 @@ index 720943d..91adb3e 100644
Exec['create_ubuntu_repo_dirs'] ->
Exec['create_ubuntu_repo_Packages'] ->
---
-1.9.1
-
diff --git a/patches/fuel-library/0003-Make-qemu-kvm-architecture-aware.patch b/patches/fuel-library/0003-Make-qemu-kvm-architecture-aware.patch
index 00cd3c7a..01cbdf83 100644
--- a/patches/fuel-library/0003-Make-qemu-kvm-architecture-aware.patch
+++ b/patches/fuel-library/0003-Make-qemu-kvm-architecture-aware.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Make qemu-kvm architecture aware
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/deployment/puppet/openstack/manifests/compute.pp b/deployment/puppet/openstack/manifests/compute.pp
-index b2339bc..4f380b8 100644
+index b2339bc..ca1b2c4 100644
--- a/deployment/puppet/openstack/manifests/compute.pp
+++ b/deployment/puppet/openstack/manifests/compute.pp
@@ -169,10 +169,15 @@ class openstack::compute (
@@ -16,8 +16,8 @@ index b2339bc..4f380b8 100644
+ # Guard against some exotic distros with their `uname -m`
+ $arch = $::architecture ? {
-+ 'arm64', 'aarch64' => 'aarch64',
-+ default => 'x86_64',
++ /(arm64|aarch64)/ => 'aarch64',
++ default => 'x86_64',
+ }
# From legacy libvirt.pp
exec { 'symlink-qemu-kvm':
@@ -28,6 +28,3 @@ index b2339bc..4f380b8 100644
}
package { 'avahi':
---
-1.9.1
-
diff --git a/patches/fuel-library/0004-Make-TestVM-creation-architecture-aware.patch b/patches/fuel-library/0004-Make-TestVM-creation-architecture-aware.patch
index 0ea66f66..b9a8ed10 100644
--- a/patches/fuel-library/0004-Make-TestVM-creation-architecture-aware.patch
+++ b/patches/fuel-library/0004-Make-TestVM-creation-architecture-aware.patch
@@ -7,12 +7,12 @@ images.
---
deployment/puppet/openstack/manifests/img/cirros.pp | 8 ++++++--
.../puppet/osnailyfacter/modular/generate_vms/generate_vms.pp | 11 +++++++++++
- deployment/puppet/osnailyfacter/templates/vm_libvirt.erb | 5 ++++-
+ deployment/puppet/osnailyfacter/templates/vm_libvirt.erb | 9 ++++++++-
files/fuel-migrate/fuel-migrate | 5 ++++-
- 4 files changed, 25 insertions(+), 4 deletions(-)
+ 4 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/deployment/puppet/openstack/manifests/img/cirros.pp b/deployment/puppet/openstack/manifests/img/cirros.pp
-index 84e202e..57ae256 100644
+index 84e202e..cff06e0 100644
--- a/deployment/puppet/openstack/manifests/img/cirros.pp
+++ b/deployment/puppet/openstack/manifests/img/cirros.pp
@@ -9,6 +9,10 @@ class openstack::img::cirros (
@@ -20,8 +20,8 @@ index 84e202e..57ae256 100644
$os_name = 'cirros',
) {
+ $arch = $::architecture ? {
-+ 'arm64', 'aarch64' => 'aarch64',
-+ default => 'x86_64',
++ /(arm64|aarch64)/ => 'aarch64',
++ default => 'x86_64',
+ }
package { 'cirros-testvm':
@@ -66,7 +66,7 @@ index 6d5426a..da5954e 100644
owner => 'root',
group => 'root',
diff --git a/deployment/puppet/osnailyfacter/templates/vm_libvirt.erb b/deployment/puppet/osnailyfacter/templates/vm_libvirt.erb
-index ae2ba5b..decf3ab 100644
+index ae2ba5b..2d030d9 100644
--- a/deployment/puppet/osnailyfacter/templates/vm_libvirt.erb
+++ b/deployment/puppet/osnailyfacter/templates/vm_libvirt.erb
@@ -3,7 +3,7 @@
@@ -82,12 +82,24 @@ index ae2ba5b..decf3ab 100644
<acpi/>
<apic/>
<pae/>
-+ <% if $machine_arch == 'arm64' { %>
-+ <gic version='3' />
-+ <% } %>
++ <% if $machine_arch == 'aarch64' %>
++ <gic version='host' />
++ <% end %>
</features>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
+@@ -57,7 +60,11 @@
+ <input type='keyboard' bus='ps2'/>
+ <graphics type='vnc' port='-1' autoport='yes'/>
+ <video>
++<% if $machine_arch == 'aarch64' %>
++ <model type='vga' vram='9216' heads='1'/>
++<% else %>
+ <model type='cirrus' vram='9216' heads='1'/>
++<% end %>
+ </video>
+ <memballoon model='virtio'>
+ </memballoon>
diff --git a/files/fuel-migrate/fuel-migrate b/files/fuel-migrate/fuel-migrate
index fad9436..667d4a7 100755
--- a/files/fuel-migrate/fuel-migrate
@@ -117,6 +129,3 @@ index fad9436..667d4a7 100755
</features>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
---
-1.9.1
-
diff --git a/patches/fuel-library/0005-Disable-usb-tablet-for-aarch64.patch b/patches/fuel-library/0005-Disable-usb-tablet-for-aarch64.patch
new file mode 100644
index 00000000..37b42341
--- /dev/null
+++ b/patches/fuel-library/0005-Disable-usb-tablet-for-aarch64.patch
@@ -0,0 +1,38 @@
+From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
+Date: Tue, 15 Mar 2016 11:33:52 +0100
+Subject: [PATCH] Disable usb tablet for aarch64
+
+---
+ deployment/puppet/openstack/manifests/compute.pp | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/deployment/puppet/openstack/manifests/compute.pp b/deployment/puppet/openstack/manifests/compute.pp
+index ca1b2c4..c0349dc 100644
+--- a/deployment/puppet/openstack/manifests/compute.pp
++++ b/deployment/puppet/openstack/manifests/compute.pp
+@@ -316,6 +316,10 @@ class openstack::compute (
+ nova_config {
+ 'libvirt/live_migration_flag': value => 'VIR_MIGRATE_UNDEFINE_SOURCE,VIR_MIGRATE_PEER2PEER,VIR_MIGRATE_LIVE,VIR_MIGRATE_PERSIST_DEST';
+ 'libvirt/block_migration_flag': value => 'VIR_MIGRATE_UNDEFINE_SOURCE,VIR_MIGRATE_PEER2PEER,VIR_MIGRATE_LIVE,VIR_MIGRATE_NON_SHARED_INC';
++ 'libvirt/use_usb_tablet': value => $::architecture ? {
++ /(arm64|aarch64)/ => false,
++ default => true,
++ }
+ }
+
+ nova_config {
+@@ -364,6 +368,14 @@ class openstack::compute (
+ # Workaround for bug LP #1469308
+ # also service name for Ubuntu and Centos is the same.
+ libvirt_service_name => "libvirtd",
++ } ->
++ package { 'vgabios':
++ ensure => present;
++ } ->
++ file { '/usr/share/qemu/vgabios-stdvga.bin':
++ ensure => link,
++ target => '/usr/share/vgabios/vgabios.bin',
++ replace => false,
+ }
+
+ # From legacy libvirt.pp
diff --git a/patches/fuel-library/0006-direct-kernel-boot-for-cirros.patch b/patches/fuel-library/0006-direct-kernel-boot-for-cirros.patch
new file mode 100644
index 00000000..0c110430
--- /dev/null
+++ b/patches/fuel-library/0006-direct-kernel-boot-for-cirros.patch
@@ -0,0 +1,138 @@
+From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
+Date: Tue, 15 Mar 2016 15:01:34 +0100
+Subject: [PATCH] direct kernel boot for cirros
+
+---
+ .../osnailyfacter/modular/astute/upload_cirros.rb | 58 +++++++++++++++++++++-
+ .../puppet/osnailyfacter/templates/vm_libvirt.erb | 8 ++-
+ 2 files changed, 63 insertions(+), 3 deletions(-)
+
+diff --git a/deployment/puppet/osnailyfacter/modular/astute/upload_cirros.rb b/deployment/puppet/osnailyfacter/modular/astute/upload_cirros.rb
+index 04d597c..c342830 100755
+--- a/deployment/puppet/osnailyfacter/modular/astute/upload_cirros.rb
++++ b/deployment/puppet/osnailyfacter/modular/astute/upload_cirros.rb
+@@ -1,6 +1,7 @@
+ #!/usr/bin/env ruby
+ require 'hiera'
+
++
+ ENV['LANG'] = 'C'
+
+ hiera = Hiera.new(:config => '/etc/hiera.yaml')
+@@ -56,11 +57,17 @@ def image_list
+ fields = line.split('|').map { |f| f.chomp.strip }
+ next if fields[1] == 'ID'
+ next unless fields[2]
+- images << fields[2]
++ images << [fields[1], fields[2]]
+ end
+ {:images => images, :exit_code => return_code}
+ end
+
++def image_name_list
++ images = image_list
++ images[:images].map! { |i| i[1] }
++ images
++end
++
+ # TODO degorenko: remove --os-image-api-version after liberty (fuel-8.0) release
+ def image_create(image_hash)
+ command = <<-EOF
+@@ -79,6 +86,15 @@ EOF
+ [ stdout, return_code ]
+ end
+
++# Calls glance update-image with a given property and value
++def update_image(image_id, property, value)
++ command = "/usr/bin/glance image-update --#{property} #{value} #{image_id}"
++ puts command
++ stdout = `#{command}`
++ return_code = $?.exitstatus
++ [ stdout, return_code ]
++end
++
+ # check if Glance is online
+ # waited until the glance is started because when vCenter used as a glance
+ # backend launch may takes up to 1 minute.
+@@ -93,7 +109,7 @@ end
+ # upload image to Glance
+ # if it have not been already uploaded
+ def upload_image(image)
+- list_of_images = image_list
++ list_of_images = image_name_list
+ if list_of_images[:images].include?(image['img_name']) && list_of_images[:exit_code] == 0
+ puts "Image '#{image['img_name']}' is already present!"
+ return 0
+@@ -109,6 +125,43 @@ def upload_image(image)
+ return return_code
+ end
+
++# For each disk image try to find a kernel and initramfs images and
++# attach then to it via kernel_id and ramdisk_id glance properties.
++def connect_dependant_images(images)
++ # for each image
++ # get image id from glance
++ img_list = image_list
++ return_code = img_list[:exit_code]
++ if return_code == 0
++ images.each do |image|
++ img_list[:images].each do |il|
++ if il[1] == image['img_name']
++ image['id'] = il[0]
++ end
++ end
++ end
++ # for each image that is not in [aki, ari]
++ images.each do |image|
++ next if ['aki', 'ari'].include?(image['disk_format'])
++ images.each do |i|
++ # find aki/ari image whose name starts with this image's name
++ if i['img_name'].start_with?(image['img_name'])
++ ret = 0
++ if i['disk_format'] == 'aki'
++ _, ret = update_image(image['id'], 'property',
++ "kernel_id=#{i['id']}")
++ elsif i['disk_format'] == 'ari'
++ _, ret = update_image(image['id'], 'property',
++ "ramdisk_id=#{i['id']}")
++ end
++ return_code += ret
++ end
++ end
++ end
++ end
++ return return_code
++end
++
+ ########################
+
+ wait_for_glance
+@@ -117,6 +170,7 @@ errors = 0
+ test_vm_images.each do |image|
+ errors += upload_image(image)
+ end
++errors = connect_dependant_images(test_vm_images) unless errors != 0
+
+ exit 1 unless errors == 0
+
+diff --git a/deployment/puppet/osnailyfacter/templates/vm_libvirt.erb b/deployment/puppet/osnailyfacter/templates/vm_libvirt.erb
+index 88b2c73..65e9400 100644
+--- a/deployment/puppet/osnailyfacter/templates/vm_libvirt.erb
++++ b/deployment/puppet/osnailyfacter/templates/vm_libvirt.erb
+@@ -3,9 +3,15 @@
+ <memory unit='GiB'><%= @details['mem'] %></memory>
+ <vcpu placement='static'><%= @details['cpu'] %></vcpu>
+ <os>
+- <type arch='<%= @machine_arch %>' machine='<%= @machine_type %>'>hvm</type>
++ <type arch='<%= @machine_arch %>' machine='<%= @machine_type %>'>hvm</type>
++ <% if $machine_arch == 'aarch64' %>
++ <kernel>/var/lib/nova/<%= @details['id'] %>_vm.kernel</kernel>
++ <initrd>/var/lib/nova/<%= @details['id'] %>_vm.initramfs</initrd>
++ <cmdline>root=/dev/vda1 rw rootwait console=tty0 console=ttyS0 console=ttyAMA0</cmdline>
++ <% else %>
+ <boot dev='network'/>
+ <boot dev='hd'/>
++ <% end %>
+ </os>
+ <features>
+ <acpi/>
diff --git a/patches/fuel-library/0007-m1.micro-Increase-profile-RAM-size-to-128MB.patch b/patches/fuel-library/0007-m1.micro-Increase-profile-RAM-size-to-128MB.patch
new file mode 100644
index 00000000..8253acad
--- /dev/null
+++ b/patches/fuel-library/0007-m1.micro-Increase-profile-RAM-size-to-128MB.patch
@@ -0,0 +1,37 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Sun, 20 Mar 2016 18:24:04 +0100
+Subject: [PATCH] m1.micro: Increase profile RAM size to 128MB.
+
+TestVM (cirros) on aarch64 requires more than 64MB RAM.
+Keep profiles uniform across all archs.
+---
+ .../osnailyfacter/modular/openstack-controller/openstack-controller.pp | 2 +-
+ tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/deployment/puppet/osnailyfacter/modular/openstack-controller/openstack-controller.pp b/deployment/puppet/osnailyfacter/modular/openstack-controller/openstack-controller.pp
+index b1d8795..88e0ab3 100644
+--- a/deployment/puppet/osnailyfacter/modular/openstack-controller/openstack-controller.pp
++++ b/deployment/puppet/osnailyfacter/modular/openstack-controller/openstack-controller.pp
+@@ -233,7 +233,7 @@ if $primary_controller {
+ "OS_REGION_NAME=${region}",
+ "NOVA_ENDPOINT_TYPE=internalURL",
+ ],
+- command => 'bash -c "nova flavor-create --is-public true m1.micro auto 64 0 1"',
++ command => 'bash -c "nova flavor-create --is-public true m1.micro auto 128 0 1"',
+ #FIXME(mattymo): Upstream bug PUP-2299 for retries in unless/onlyif
+ # Retry nova-flavor list until it exits 0, then exit with grep status,
+ # finally exit 1 if tries exceeded
+diff --git a/tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb b/tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb
+index 36161e6..b15da07 100644
+--- a/tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb
++++ b/tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb
+@@ -171,7 +171,7 @@ describe manifest do
+ if primary_controller
+ it 'should retry unless when creating m1.micro flavor' do
+ should contain_exec('create-m1.micro-flavor').with(
+- 'command' => 'bash -c "nova flavor-create --is-public true m1.micro auto 64 0 1"',
++ 'command' => 'bash -c "nova flavor-create --is-public true m1.micro auto 128 0 1"',
+ 'unless' => 'bash -c \'for tries in {1..10}; do
+ nova flavor-list | grep m1.micro;
+ status=("${PIPESTATUS[@]}");
diff --git a/patches/fuel-main/0001-Use-qemu-debootstrap-to-support-multi-arch.patch b/patches/fuel-main/0001-Use-qemu-debootstrap-to-support-multi-arch.patch
index 8b5e38d7..15dcac3e 100644
--- a/patches/fuel-main/0001-Use-qemu-debootstrap-to-support-multi-arch.patch
+++ b/patches/fuel-main/0001-Use-qemu-debootstrap-to-support-multi-arch.patch
@@ -48,6 +48,3 @@ index 3c65cc6..cf3704b 100644
if [ -e $(SANDBOX_UBUNTU)/etc/resolv.conf ]; then sudo cp -a $(SANDBOX_UBUNTU)/etc/resolv.conf $(SANDBOX_UBUNTU)/etc/resolv.conf.orig; fi
sudo cp /etc/resolv.conf $(SANDBOX_UBUNTU)/etc/resolv.conf
if [ -e $(SANDBOX_UBUNTU)/etc/hosts ]; then sudo cp -a $(SANDBOX_UBUNTU)/etc/hosts $(SANDBOX_UBUNTU)/etc/hosts.orig; fi
---
-1.9.1
-
diff --git a/patches/fuel-main/0002-Allow-multi-arch-debian-mirrors.patch b/patches/fuel-main/0002-Allow-multi-arch-debian-mirrors.patch
index d95abcac..9be98494 100644
--- a/patches/fuel-main/0002-Allow-multi-arch-debian-mirrors.patch
+++ b/patches/fuel-main/0002-Allow-multi-arch-debian-mirrors.patch
@@ -40,6 +40,3 @@ index cf3704b..18757a1 100644
if [ -e $(SANDBOX_UBUNTU)/etc/resolv.conf ]; then sudo cp -a $(SANDBOX_UBUNTU)/etc/resolv.conf $(SANDBOX_UBUNTU)/etc/resolv.conf.orig; fi
sudo cp /etc/resolv.conf $(SANDBOX_UBUNTU)/etc/resolv.conf
if [ -e $(SANDBOX_UBUNTU)/etc/hosts ]; then sudo cp -a $(SANDBOX_UBUNTU)/etc/hosts $(SANDBOX_UBUNTU)/etc/hosts.orig; fi
---
-1.9.1
-
diff --git a/patches/fuel-main/0003-Follow-redirects.patch b/patches/fuel-main/0003-Follow-redirects.patch
index 3d1d1b8b..17ae85d5 100644
--- a/patches/fuel-main/0003-Follow-redirects.patch
+++ b/patches/fuel-main/0003-Follow-redirects.patch
@@ -19,6 +19,3 @@ index ae4766b..2a99278 100644
# Expand repo URLs now
#MIRROR_CENTOS:=$(call expand_repo_url,$(MIRROR_CENTOS))
---
-1.9.1
-
diff --git a/patches/fuel-main/0004-Add-apt-https-support-package-to-sandbox.patch b/patches/fuel-main/0004-Add-apt-https-support-package-to-sandbox.patch
index da08ff80..ee92f2f1 100644
--- a/patches/fuel-main/0004-Add-apt-https-support-package-to-sandbox.patch
+++ b/patches/fuel-main/0004-Add-apt-https-support-package-to-sandbox.patch
@@ -19,6 +19,3 @@ index 18757a1..c450d19 100644
if [ -e $(SANDBOX_UBUNTU)/etc/resolv.conf ]; then sudo cp -a $(SANDBOX_UBUNTU)/etc/resolv.conf $(SANDBOX_UBUNTU)/etc/resolv.conf.orig; fi
sudo cp /etc/resolv.conf $(SANDBOX_UBUNTU)/etc/resolv.conf
if [ -e $(SANDBOX_UBUNTU)/etc/hosts ]; then sudo cp -a $(SANDBOX_UBUNTU)/etc/hosts $(SANDBOX_UBUNTU)/etc/hosts.orig; fi
---
-1.9.1
-
diff --git a/patches/fuel-main/0005-Make-cpio-accept-symlinks.patch b/patches/fuel-main/0005-Make-cpio-accept-symlinks.patch
index 269eb907..00c2ce41 100644
--- a/patches/fuel-main/0005-Make-cpio-accept-symlinks.patch
+++ b/patches/fuel-main/0005-Make-cpio-accept-symlinks.patch
@@ -25,6 +25,3 @@ index cb09691..3f28172 100644
for version in `ls -1 $(INITRAMROOT)/lib/modules`; do \
sudo depmod -b $(INITRAMROOT) $$version; \
done
---
-1.9.1
-
diff --git a/patches/fuel-main/0006-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch b/patches/fuel-main/0006-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch
index 0fafba2f..e3d13b85 100644
--- a/patches/fuel-main/0006-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch
+++ b/patches/fuel-main/0006-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch
@@ -37,6 +37,3 @@ index 3c5d411..c1a359b 100644
# Run puppet to apply custom config
---
-1.9.1
-
diff --git a/patches/fuel-mirror/0001-Set-mos-ubuntu-base-URL-to-linux.enea.com.patch b/patches/fuel-mirror/0001-Set-mos-ubuntu-base-URL-to-linux.enea.com.patch
index 544172f7..a12c4143 100644
--- a/patches/fuel-mirror/0001-Set-mos-ubuntu-base-URL-to-linux.enea.com.patch
+++ b/patches/fuel-mirror/0001-Set-mos-ubuntu-base-URL-to-linux.enea.com.patch
@@ -8,17 +8,14 @@ Contents of amd64 mos-ubuntu repos should be in sync with arm64.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/fuel_mirror/data/ubuntu.yaml b/contrib/fuel_mirror/data/ubuntu.yaml
-index 5ce288e..9a22ef4 100644
+index 5ce288e..7bc0c4b 100644
--- a/contrib/fuel_mirror/data/ubuntu.yaml
+++ b/contrib/fuel_mirror/data/ubuntu.yaml
@@ -1,6 +1,6 @@
# GLOBAL variables
ubuntu_baseurl: &ubuntu_baseurl http://archive.ubuntu.com/ubuntu
-mos_baseurl: &mos_baseurl http://mirror.fuel-infra.org/mos-repos/ubuntu/$mos_version
-+mos_baseurl: &mos_baseurl https://linux.enea.com/mos-repos/ubuntu/$mos_version
++mos_baseurl: &mos_baseurl http://linux.enea.com/mos-repos/ubuntu/$mos_version
fuel_release_match:
version: $openstack_version
---
-1.9.1
-
diff --git a/patches/fuel-mirror/0002-Add-fuel-agent-dependencies-to-Ubuntu-mirror.patch b/patches/fuel-mirror/0002-Add-fuel-agent-dependencies-to-Ubuntu-mirror.patch
index acdbe9a2..2f002308 100644
--- a/patches/fuel-mirror/0002-Add-fuel-agent-dependencies-to-Ubuntu-mirror.patch
+++ b/patches/fuel-mirror/0002-Add-fuel-agent-dependencies-to-Ubuntu-mirror.patch
@@ -15,7 +15,7 @@ missing deps from local mirror too?
1 file changed, 2 insertions(+)
diff --git a/contrib/fuel_mirror/data/ubuntu.yaml b/contrib/fuel_mirror/data/ubuntu.yaml
-index 9a22ef4..1e12508 100644
+index 7bc0c4b..65026ed 100644
--- a/contrib/fuel_mirror/data/ubuntu.yaml
+++ b/contrib/fuel_mirror/data/ubuntu.yaml
@@ -77,6 +77,7 @@ packages: &packages
@@ -34,6 +34,3 @@ index 9a22ef4..1e12508 100644
- "rsyslog-gnutls"
- "rsyslog-relp"
- "screen"
---
-1.9.1
-
diff --git a/patches/fuel-plugin-opendaylight/0001-arm64-support-for-OpenDaylight-Fuel-Plugin.patch b/patches/fuel-plugin-opendaylight/0001-arm64-support-for-OpenDaylight-Fuel-Plugin.patch
new file mode 100644
index 00000000..b439b38e
--- /dev/null
+++ b/patches/fuel-plugin-opendaylight/0001-arm64-support-for-OpenDaylight-Fuel-Plugin.patch
@@ -0,0 +1,378 @@
+From: Florin Dumitrascu <florin.dumitrascu@enea.com>
+Date: Thu, 17 Mar 2016 18:15:42 +0100
+Subject: [PATCH] arm64 support for OpenDaylight Fuel Plugin
+
+ODL depends on a native library (leveldb).
+ODL Beryllium version is still using a native x86 version of
+this library (wrapped in leveldbjni). There is no upstream version
+of leveldbjni supporting arm64 leveldb, so we need to compile it
+when deploying ODL. This is done when running odl-install puppet manifest.
+For more info about this ODL limitation, read here:
+https://bugs.opendaylight.org/show_bug.cgi?id=3973
+
+Signed-off-by: Florin Dumitrascu <florin.dumitrascu@enea.com>
+---
+ .../modules/opendaylight/files/leveldb-arm64.patch | 36 +++++
+ .../opendaylight/files/leveldbjni-native.patch | 23 ++++
+ .../puppet/modules/opendaylight/manifests/init.pp | 8 ++
+ .../modules/opendaylight/manifests/install.pp | 12 +-
+ .../modules/opendaylight/manifests/leveldbjni.pp | 150 +++++++++++++++++++++
+ deployment_tasks.yaml | 2 +-
+ odl_package/ubuntu/opendaylight | 4 +-
+ pre_build_hook | 9 +-
+ 8 files changed, 235 insertions(+), 9 deletions(-)
+ create mode 100644 deployment_scripts/puppet/modules/opendaylight/files/leveldb-arm64.patch
+ create mode 100644 deployment_scripts/puppet/modules/opendaylight/files/leveldbjni-native.patch
+ create mode 100644 deployment_scripts/puppet/modules/opendaylight/manifests/leveldbjni.pp
+
+diff --git a/deployment_scripts/puppet/modules/opendaylight/files/leveldb-arm64.patch b/deployment_scripts/puppet/modules/opendaylight/files/leveldb-arm64.patch
+new file mode 100644
+index 0000000..c72efeb
+--- /dev/null
++++ b/deployment_scripts/puppet/modules/opendaylight/files/leveldb-arm64.patch
+@@ -0,0 +1,36 @@
++diff --git a/port/atomic_pointer.h b/port/atomic_pointer.h
++index e17bf43..78cb6b3 100644
++--- a/port/atomic_pointer.h
+++++ b/port/atomic_pointer.h
++@@ -36,6 +36,8 @@
++ #define ARCH_CPU_X86_FAMILY 1
++ #elif defined(__ARMEL__)
++ #define ARCH_CPU_ARM_FAMILY 1
+++#elif defined(__aarch64__)
+++#define ARCH_CPU_ARM64_FAMILY 1
++ #elif defined(__ppc__) || defined(__powerpc__) || defined(__powerpc64__)
++ #define ARCH_CPU_PPC_FAMILY 1
++ #endif
++@@ -93,6 +95,13 @@ inline void MemoryBarrier() {
++ }
++ #define LEVELDB_HAVE_MEMORY_BARRIER
++
+++// ARM64
+++#elif defined(ARCH_CPU_ARM64_FAMILY)
+++inline void MemoryBarrier() {
+++ asm volatile("dmb sy" : : : "memory");
+++}
+++#define LEVELDB_HAVE_MEMORY_BARRIER
+++
++ // PPC
++ #elif defined(ARCH_CPU_PPC_FAMILY) && defined(__GNUC__)
++ inline void MemoryBarrier() {
++@@ -216,6 +225,7 @@ class AtomicPointer {
++ #undef LEVELDB_HAVE_MEMORY_BARRIER
++ #undef ARCH_CPU_X86_FAMILY
++ #undef ARCH_CPU_ARM_FAMILY
+++#undef ARCH_CPU_ARM64_FAMILY
++ #undef ARCH_CPU_PPC_FAMILY
++
++ } // namespace port
++
+diff --git a/deployment_scripts/puppet/modules/opendaylight/files/leveldbjni-native.patch b/deployment_scripts/puppet/modules/opendaylight/files/leveldbjni-native.patch
+new file mode 100644
+index 0000000..7520205
+--- /dev/null
++++ b/deployment_scripts/puppet/modules/opendaylight/files/leveldbjni-native.patch
+@@ -0,0 +1,23 @@
++diff --git a/leveldbjni-all/pom.xml b/leveldbjni-all/pom.xml
++index 426f2a6..c4a2a16 100755
++--- a/leveldbjni-all/pom.xml
+++++ b/leveldbjni-all/pom.xml
++@@ -41,7 +41,7 @@
++
++ <groupId>org.fusesource.leveldbjni</groupId>
++ <artifactId>leveldbjni-all</artifactId>
++- <version>1.8</version>
+++ <version>1.8-odl</version>
++ <packaging>bundle</packaging>
++
++ <name>${project.artifactId}</name>
++@@ -119,7 +119,8 @@
++ META-INF/native/osx/libleveldbjni.jnilib;osname=macosx;processor=x86,
++ META-INF/native/osx/libleveldbjni.jnilib;osname=macosx;processor=x86-64,
++ META-INF/native/linux32/libleveldbjni.so;osname=Linux;processor=x86,
++- META-INF/native/linux64/libleveldbjni.so;osname=Linux;processor=x86-64
+++ META-INF/native/linux64/libleveldbjni.so;osname=Linux;processor=x86-64,
+++ META-INF/native/linux64/libleveldbjni.so;osname=Linux;processor=aarch64
++ </Bundle-NativeCode>
++ </instructions>
++ </configuration>
+diff --git a/deployment_scripts/puppet/modules/opendaylight/manifests/init.pp b/deployment_scripts/puppet/modules/opendaylight/manifests/init.pp
+index 8dfb213..95b3de7 100644
+--- a/deployment_scripts/puppet/modules/opendaylight/manifests/init.pp
++++ b/deployment_scripts/puppet/modules/opendaylight/manifests/init.pp
+@@ -8,4 +8,12 @@ class opendaylight {
+ $manager_ip_address = $odl_controller_hash[0]['internal_address']
+ $node_private_address = $node[0]['private_address']
+ $node_internal_address = $node[0]['internal_address']
++
++ $arch = $::architecture ? {
++ 'aarch64' => $::osfamily ? {
++ 'Debian' => 'arm64',
++ default => 'aarch64',
++ },
++ default => $::architecture,
++ }
+ }
+diff --git a/deployment_scripts/puppet/modules/opendaylight/manifests/install.pp b/deployment_scripts/puppet/modules/opendaylight/manifests/install.pp
+index 7a3bf3f..f9bba56 100644
+--- a/deployment_scripts/puppet/modules/opendaylight/manifests/install.pp
++++ b/deployment_scripts/puppet/modules/opendaylight/manifests/install.pp
+@@ -19,6 +19,12 @@ class opendaylight::install (
+ ensure => installed,
+ }
+
++ if ($::osfamily == 'Debian' and $::opendaylight::arch == 'arm64') {
++ class { 'opendaylight::leveldbjni':
++ require => Package['opendaylight'],
++ }
++ }
++
+ package {'opnfv-quagga':
+ ensure => installed,
+ }
+@@ -36,7 +42,8 @@ class opendaylight::install (
+
+ debug("Set odl rest api port to ${rest_port}")
+
+- file { "${conf_dir}/jetty.xml":
++ file { 'jetty.xml':
++ path => "${conf_dir}/jetty.xml",
+ ensure => file,
+ owner => 'odl',
+ content => template('opendaylight/jetty.xml.erb')
+@@ -72,6 +79,7 @@ class opendaylight::install (
+ Package['opendaylight'] ->
+ Ini_setting <||> ->
+ Firewall <||> ->
+- File <||> ->
++ File['jetty.xml'] ->
++ Class['opendaylight::leveldbjni'] ->
+ Service['opendaylight']
+ }
+diff --git a/deployment_scripts/puppet/modules/opendaylight/manifests/leveldbjni.pp b/deployment_scripts/puppet/modules/opendaylight/manifests/leveldbjni.pp
+new file mode 100644
+index 0000000..c708611
+--- /dev/null
++++ b/deployment_scripts/puppet/modules/opendaylight/manifests/leveldbjni.pp
+@@ -0,0 +1,150 @@
++# == Class opendaylight::leveldbjni
++#
++# Manages compilation of JNI for leveldb.
++#
++# It compiles the leveldbjni from sources and patches it so that it's properly
++# detected by maven on arm64 system.
++#
++class opendaylight::leveldbjni(
++ $target = '/opt/opendaylight',
++ $user = 'odl',
++ $branch = 'leveldbjni-1.8',
++) {
++ case $::osfamily {
++ 'Debian', 'Ubuntu': {}
++ default: {
++ fail('Not supported on OS other than Debian based.')
++ }
++ }
++
++ $libsnappy_dir = '/usr/lib'
++ $leveldb_dir = "${target}/leveldb"
++ $leveldbjni_dir = "${target}/leveldbjni"
++ $environment = ["SNAPPY_HOME=${libsnappy_dir}", "LEVELDB_HOME=${leveldb_dir}", "LEVELDBJNI_HOME=${leveldbjni_dir}", "LIBRARY_PATH=${libsnappy_dir}", "C_INCLUDE_PATH=${libsnappy_dir}", "CPLUS_INCLUDE_PATH=${libsnappy_dir}","JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-${::opendaylight::arch}"]
++ $parallel_jobs = ($processorcount + 1)/2
++
++ if ! defined(Package['git']) {
++ package { 'git':
++ ensure => 'present',
++ }
++ }
++ if ! defined(Package['build-essential']) {
++ package { 'build-essential':
++ ensure => 'present',
++ }
++ }
++ if ! defined(Package['automake']) {
++ package { 'automake':
++ ensure => 'present',
++ }
++ }
++ if ! defined(Package['make']) {
++ package { 'make':
++ ensure => 'present',
++ }
++ }
++ if ! defined(Package['libsnappy-dev']) {
++ package { 'libsnappy-dev':
++ ensure => 'present',
++ }
++ }
++ if ! defined(Package['patch']) {
++ package { 'patch':
++ ensure => 'present',
++ }
++ }
++ if ! defined(Package['maven']) {
++ package { 'maven':
++ ensure => 'present',
++ }
++ }
++ if ! defined(Package['openjdk-7-jdk']) {
++ package { 'openjdk-7-jdk':
++ ensure => 'present',
++ }
++ }
++
++ exec { 'leveldb-fetch':
++ path => ['/usr/bin'],
++ command => "git clone git://github.com/chirino/leveldb.git ${leveldb_dir}",
++ creates => "${leveldb_dir}/.git",
++ user => $user,
++ require => [Package['git']],
++ } ->
++ exec { 'leveldbjni-fetch':
++ path => ['/usr/bin'],
++ command => "git clone https://github.com/fusesource/leveldbjni.git -b ${branch} ${leveldbjni_dir}",
++ creates => "${leveldbjni_dir}/.git",
++ user => $user,
++ require => [Package['git']],
++ } ->
++ exec { 'leveldb-merge-google':
++ path => ['/usr/bin', '/bin'],
++ command => "git config user.name odl && git config user.email 'o@d.l' && git remote add google https://github.com/google/leveldb.git && git fetch google master && git fetch --tags google && git merge --no-edit v1.18",
++ unless => "git remote | grep google",
++ cwd => $leveldb_dir,
++ user => $user,
++ require => [Package['git']],
++ } ->
++ exec { 'leveldb-patch':
++ path => ['/usr/bin'],
++ command => "patch -p1 < ${leveldbjni_dir}/leveldb.patch",
++ unless => "patch -p1 -R -N --dry-run < ${leveldbjni_dir}/leveldb.patch",
++ cwd => $leveldb_dir,
++ user => $user,
++ require => [Package['patch']],
++ } ->
++ file { "${leveldb_dir}/leveldb-arm64.patch":
++ ensure => "file",
++ source => "puppet:///modules/opendaylight/leveldb-arm64.patch",
++ owner => $user,
++ } ->
++ exec { 'leveldb-patch-for-arm64':
++ path => ['/usr/bin'],
++ command => "patch -p1 < ${leveldb_dir}/leveldb-arm64.patch",
++ unless => "patch -p1 -R -N --dry-run < ${leveldb_dir}/leveldb-arm64.patch",
++ cwd => $leveldb_dir,
++ user => $user,
++ require => [Package['patch']],
++ } ->
++ exec { 'leveldb-build':
++ command => "/usr/bin/make libleveldb.a -j${parallel_jobs}",
++ creates => "${leveldb_dir}/libleveldb.a",
++ environment => $environment,
++ cwd => $leveldb_dir,
++ user => $user,
++ require => [Package['git'], Package['make'], Package['build-essential']],
++ } ->
++ file { "${leveldbjni_dir}/leveldbjni.patch":
++ ensure => "file",
++ source => "puppet:///modules/opendaylight/leveldbjni-native.patch",
++ owner => $user,
++ } ->
++ exec { 'leveldbjni-patch':
++ path => ['/usr/bin'],
++ command => "patch -p1 < ${leveldbjni_dir}/leveldbjni.patch",
++ unless => "patch -p1 -R -N --dry-run < ${leveldbjni_dir}/leveldbjni.patch",
++ cwd => $leveldbjni_dir,
++ user => $user,
++ require => [Package['patch']],
++ } ->
++ exec { 'leveldbjni-build':
++ command => "/usr/bin/mvn clean install -P download -P linux64 -P all",
++ # Creates requires a fully qualified path which we don't have
++ unless => "/usr/bin/test -d ~${user}/.m2/repository/org/fusesource/leveldbjni/leveldbjni-all",
++ environment => $environment,
++ cwd => $leveldbjni_dir,
++ user => $user,
++ timeout => 1200,
++ require => [Package['maven']],
++ } ->
++ # Can't do this with 'file' type because we need to purge existing package
++ # and at the same time don't perform the copy if we've already copied our
++ # package.
++ exec { 'leveldbjni-copy':
++ path => ['/bin'],
++ command => "rm -rf ${target}/system/org/fusesource/leveldbjni && cp -r ~${user}/.m2/repository/org/fusesource/leveldbjni $target/system/org/fusesource/",
++ creates => "${target}/system/org/fusesource/leveldbjni/leveldbjni-linux64",
++ user => $user,
++ }
++}
+diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
+index 6588db3..0fe77af 100644
+--- a/deployment_tasks.yaml
++++ b/deployment_tasks.yaml
+@@ -17,7 +17,7 @@
+ parameters:
+ puppet_manifest: puppet/manifests/odl-install.pp
+ puppet_modules: puppet/modules:/etc/puppet/modules
+- timeout: 720
++ timeout: 3600
+ - id: netconfig
+ type: skipped
+ - id: odl-netconfig
+diff --git a/odl_package/ubuntu/opendaylight b/odl_package/ubuntu/opendaylight
+index c7f5082..6e5ff7b 100644
+--- a/odl_package/ubuntu/opendaylight
++++ b/odl_package/ubuntu/opendaylight
+@@ -9,7 +9,7 @@ setgid odl
+ setuid odl
+
+ env KARAF_HOME="/opt/opendaylight"
+-env JAVA_HOME="/usr/lib/jvm/java-7-openjdk-amd64"
++env JAVA_HOME="/usr/lib/jvm/java-7-openjdk-arm64"
+ env JAVA_OPTS="-server -Xms256M -Xmx2048M -XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass -XX:MaxPermSize=512M -Dcom.sun.management.jmxremote"
+ env OPTS="-Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=true"
+ env MAIN="org.apache.karaf.main.Main"
+@@ -34,6 +34,6 @@ script
+ fi
+ done
+
+- exec /usr/bin/java $JAVA_OPTS -Djava.endorsed.dirs="${JAVA_ENDORSED_DIRS}" -Djava.ext.dirs="${JAVA_EXT_DIRS}" -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Dkaraf.data="$KARAF_DATA" -Dkaraf.etc="$KARAF_ETC" -Djava.io.tmpdir="$KARAF_DATA/tmp" -Djava.util.logging.config.file="$KARAF_BASE/etc/java.util.logging.properties" $KARAF_OPTS $OPTS -classpath "$CLASSPATH" $MAIN
++ exec ${JAVA_HOME}/bin/java $JAVA_OPTS -Djava.endorsed.dirs="${JAVA_ENDORSED_DIRS}" -Djava.ext.dirs="${JAVA_EXT_DIRS}" -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Dkaraf.data="$KARAF_DATA" -Dkaraf.etc="$KARAF_ETC" -Djava.io.tmpdir="$KARAF_DATA/tmp" -Djava.util.logging.config.file="$KARAF_BASE/etc/java.util.logging.properties" $KARAF_OPTS $OPTS -classpath "$CLASSPATH" $MAIN
+
+ end script
+diff --git a/pre_build_hook b/pre_build_hook
+index db64e80..b2b97b3 100755
+--- a/pre_build_hook
++++ b/pre_build_hook
+@@ -41,7 +41,7 @@ fi
+
+ function cleanup {
+ rm -rf "${TMP_DIR}"
+- sed -i -e "s/java-8-openjdk-amd64/java-7-openjdk-amd64/" "${DIR}/odl_package/ubuntu/opendaylight"
++ sed -i -e "s/java-8-openjdk-arm64/java-7-openjdk-arm64/" "${DIR}/odl_package/ubuntu/opendaylight"
+ }
+
+ function download {
+@@ -87,11 +87,12 @@ function build_pkg {
+ ;;
+ ubuntu)
+ pushd "${DIR}/repositories/${1}/"
+- fpm --force -s dir -t deb -m 'mskalski@mirantis.com' --version "${ODL_VERSION_NUMBER}" --description "${ODL_DESCRIPTION}" --prefix /opt/opendaylight --deb-upstart "${DIR}/odl_package/${1}/opendaylight" --after-install "${DIR}/odl_package/${1}/opendaylight-post" --name opendaylight -d "${JAVA_VERSION}" -C "${TMP_DIR}/opendaylight_src"
++ fpm --force -s dir -t deb -a arm64 -m 'mskalski@mirantis.com' --version "${ODL_VERSION_NUMBER}" --description "${ODL_DESCRIPTION}" --prefix /opt/opendaylight --deb-upstart "${DIR}/odl_package/${1}/opendaylight" --after-install "${DIR}/odl_package/${1}/opendaylight-post" --name opendaylight -d "${JAVA_VERSION}" -C "${TMP_DIR}/opendaylight_src"
+ fpm --force -s python -t deb -m 'mskalski@mirantis.com' --python-install-lib /usr/lib/python2.7/dist-packages ${TMP_DIR}/networking_odl/setup.py
+ download_dependencies ${1}
+ popd
+- add_opnfv_quagga "${DIR}/repositories/${1}/"
++ # We are adding arm64 opnfv quagga in our local repository
++ #add_opnfv_quagga "${DIR}/repositories/${1}/"
+ ;;
+ *) echo "Not supported system"; exit 1;;
+ esac
+@@ -103,7 +104,7 @@ cleanup
+
+ if [ "$USE_JAVA8" = true ]
+ then
+- sed -i -e "s/java-7-openjdk-amd64/java-8-openjdk-amd64/" "${DIR}/odl_package/ubuntu/opendaylight"
++ sed -i -e "s/java-7-openjdk-arm64/java-8-openjdk-arm64/" "${DIR}/odl_package/ubuntu/opendaylight"
+ fi
+
+ mkdir -p "${TMP_DIR}"
diff --git a/patches/fuel-plugin-ovsnfv/0001-fuel-plugin-Pick-updated-numa.-packages.patch b/patches/fuel-plugin-ovsnfv/0001-fuel-plugin-Pick-updated-numa.-packages.patch
index bbd90cb8..22f3b226 100644
--- a/patches/fuel-plugin-ovsnfv/0001-fuel-plugin-Pick-updated-numa.-packages.patch
+++ b/patches/fuel-plugin-ovsnfv/0001-fuel-plugin-Pick-updated-numa.-packages.patch
@@ -31,6 +31,3 @@ index 7d62008..1766086 100644
https://pypi.python.org/packages/source/l/libvirt-python/libvirt-python-1.2.12.tar.gz
http://archive.ubuntu.com/ubuntu/pool/main/libg/libgpg-error/libgpg-error-dev_1.12-0.2ubuntu1_amd64.deb
http://archive.ubuntu.com/ubuntu/pool/main/libg/libgcrypt11/libgcrypt11-dev_1.5.3-2ubuntu4.3_amd64.deb
---
-1.9.1
-
diff --git a/patches/fuel-plugin-qemu/0001-Fix-apt-cache-and-qemu-version-handling.patch b/patches/fuel-plugin-qemu/0001-Fix-apt-cache-and-qemu-version-handling.patch
index 208cb93f..9a77c3a3 100644
--- a/patches/fuel-plugin-qemu/0001-Fix-apt-cache-and-qemu-version-handling.patch
+++ b/patches/fuel-plugin-qemu/0001-Fix-apt-cache-and-qemu-version-handling.patch
@@ -26,6 +26,3 @@ index 652939e..f54f486 100755
cd ../qemu-2.2.1;echo "">> debian/patches/series
sed -i 's/seccomp="yes"/seccomp="no"/' configure
debian/rules build
---
-1.9.1
-
diff --git a/patches/fuel-web/0001-Add-arm64-fixture.patch b/patches/fuel-web/0001-Add-arm64-fixture.patch
index 58a64e49..95281c8c 100644
--- a/patches/fuel-web/0001-Add-arm64-fixture.patch
+++ b/patches/fuel-web/0001-Add-arm64-fixture.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Add arm64 fixture
1 file changed, 99 insertions(+)
diff --git a/nailgun/nailgun/fixtures/openstack.yaml b/nailgun/nailgun/fixtures/openstack.yaml
-index f9c8ab6..4daa2a2 100644
+index f9c8ab6..bf6f7c4 100644
--- a/nailgun/nailgun/fixtures/openstack.yaml
+++ b/nailgun/nailgun/fixtures/openstack.yaml
@@ -2079,3 +2079,102 @@
@@ -69,19 +69,19 @@ index f9c8ab6..4daa2a2 100644
+ priority: 1050
+ - type: "deb"
+ name: "mos-updates"
-+ uri: "https://linux.enea.com/mos-repos/ubuntu/{cluster.release.environment_version}/"
++ uri: "http://linux.enea.com/mos-repos/ubuntu/{cluster.release.environment_version}"
+ suite: "mos8.0-updates"
+ section: "main restricted"
+ priority: 1050
+ - type: "deb"
+ name: "mos-security"
-+ uri: "https://linux.enea.com/mos-repos/ubuntu/{cluster.release.environment_version}/"
++ uri: "http://linux.enea.com/mos-repos/ubuntu/{cluster.release.environment_version}"
+ suite: "mos8.0-security"
+ section: "main restricted"
+ priority: 1050
+ - type: "deb"
+ name: "mos-holdback"
-+ uri: "https://linux.enea.com/mos-repos/ubuntu/{cluster.release.environment_version}/"
++ uri: "http://linux.enea.com/mos-repos/ubuntu/{cluster.release.environment_version}"
+ suite: "mos8.0-holdback"
+ section: "main restricted"
+ priority: 1100
@@ -113,6 +113,3 @@ index f9c8ab6..4daa2a2 100644
+ uri: "http://{settings.MASTER_IP}:8080/targetimages/env_{cluster.id}_ubuntu_1404_arm64-boot.img.gz"
+ format: "ext2"
+ container: "gzip"
---
-1.9.1
-
diff --git a/patches/fuel-web/0002-Add-arch-to-nailgun-release-and-target-image.patch b/patches/fuel-web/0002-Add-arch-to-nailgun-release-and-target-image.patch
index c5742f01..7af57961 100644
--- a/patches/fuel-web/0002-Add-arch-to-nailgun-release-and-target-image.patch
+++ b/patches/fuel-web/0002-Add-arch-to-nailgun-release-and-target-image.patch
@@ -6,15 +6,17 @@ Thsi is required so that the TestVM image is created using a cirros
image that is compatible with the architecture of the deployment setup.
As a bonus, it is also used when building the target image.
---
- nailgun/nailgun/consts.py | 5 +++
- .../alembic_migrations/versions/armband.py | 47 ++++++++++++++++++++++
+ nailgun/nailgun/consts.py | 5 ++
+ .../alembic_migrations/versions/armband.py | 53 ++++++++++++++++++++++
nailgun/nailgun/db/sqlalchemy/models/release.py | 8 ++++
nailgun/nailgun/fixtures/openstack.yaml | 3 ++
- .../nailgun/orchestrator/deployment_serializers.py | 9 ++++-
+ .../nailgun/orchestrator/deployment_serializers.py | 9 +++-
.../orchestrator/provisioning_serializers.py | 3 +-
- nailgun/nailgun/orchestrator/tasks_templates.py | 5 ++-
+ nailgun/nailgun/orchestrator/tasks_templates.py | 5 +-
+ .../integration/test_cluster_changes_handler.py | 12 ++---
+ .../integration/test_orchestrator_serializer.py | 4 +-
nailgun/nailgun/test/unit/test_tasks_templates.py | 6 ++-
- 8 files changed, 80 insertions(+), 6 deletions(-)
+ 10 files changed, 94 insertions(+), 14 deletions(-)
create mode 100644 nailgun/nailgun/db/migration/alembic_migrations/versions/armband.py
diff --git a/nailgun/nailgun/consts.py b/nailgun/nailgun/consts.py
@@ -35,10 +37,10 @@ index bb69168..2c19ec9 100644
'ha_full',
diff --git a/nailgun/nailgun/db/migration/alembic_migrations/versions/armband.py b/nailgun/nailgun/db/migration/alembic_migrations/versions/armband.py
new file mode 100644
-index 0000000..8b832df
+index 0000000..ad297b1
--- /dev/null
+++ b/nailgun/nailgun/db/migration/alembic_migrations/versions/armband.py
-@@ -0,0 +1,47 @@
+@@ -0,0 +1,53 @@
+# Copyright 2016 Mirantis, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -66,23 +68,29 @@ index 0000000..8b832df
+down_revision = '43b2cb64dae6'
+
+from alembic import op
++from nailgun.utils.migration import drop_enum
+import sqlalchemy as sa
-+from sqlalchemy.dialects import postgresql
+
+ENUMS = (
-+ 'release_arch')
++ 'release_arch',
++)
++
+
+def upgrade():
+ add_release_arch()
+
++
+def downgrade():
+ remove_release_arch()
+ map(drop_enum, ENUMS)
+
++
+def add_release_arch():
+ arch_enum = sa.Enum('amd64', 'arm64', name='release_arch')
+ arch_enum.create(op.get_bind(), checkfirst=False)
-+ op.add_column('releases', sa.Column('arch', arch_enum, nullable=False))
++ op.add_column('releases', sa.Column('arch', arch_enum, nullable=False,
++ server_default='amd64'))
++
+
+def remove_release_arch():
+ op.drop_column('releases', 'arch')
@@ -106,7 +114,7 @@ index 96cf2ed..62ac2c1 100644
nullable=False, server_default='[]')
description = Column(Unicode)
diff --git a/nailgun/nailgun/fixtures/openstack.yaml b/nailgun/nailgun/fixtures/openstack.yaml
-index 4daa2a2..733fa0c 100644
+index bf6f7c4..4979fb5 100644
--- a/nailgun/nailgun/fixtures/openstack.yaml
+++ b/nailgun/nailgun/fixtures/openstack.yaml
@@ -1913,6 +1913,7 @@
@@ -190,6 +198,83 @@ index 39f2067..cd2278c 100644
'timeout': settings.PROVISIONING_IMAGES_BUILD_TIMEOUT,
'retries': 1}})
+diff --git a/nailgun/nailgun/test/integration/test_cluster_changes_handler.py b/nailgun/nailgun/test/integration/test_cluster_changes_handler.py
+index 56bd307..34b4ce3 100644
+--- a/nailgun/nailgun/test/integration/test_cluster_changes_handler.py
++++ b/nailgun/nailgun/test/integration/test_cluster_changes_handler.py
+@@ -159,7 +159,7 @@ class TestHandlers(BaseIntegrationTest):
+ common_attrs['last_controller'] = controller_nodes[-1]['name']
+ common_attrs['storage']['pg_num'] = 128
+
+- common_attrs['test_vm_image'] = {
++ common_attrs['test_vm_image'] = [{
+ 'container_format': 'bare',
+ 'public': 'true',
+ 'disk_format': 'qcow2',
+@@ -171,7 +171,7 @@ class TestHandlers(BaseIntegrationTest):
+ """--property murano_image_info="""
+ """'{"title": "Murano Demo", "type": "cirros.demo"}'"""
+ ),
+- }
++ }]
+
+ critical_mapping = {
+ 'primary-controller': True,
+@@ -575,7 +575,7 @@ class TestHandlers(BaseIntegrationTest):
+ common_attrs['last_controller'] = controller_nodes[-1]['name']
+ common_attrs['storage']['pg_num'] = 128
+
+- common_attrs['test_vm_image'] = {
++ common_attrs['test_vm_image'] = [{
+ 'container_format': 'bare',
+ 'public': 'true',
+ 'disk_format': 'qcow2',
+@@ -587,7 +587,7 @@ class TestHandlers(BaseIntegrationTest):
+ """--property murano_image_info="""
+ """'{"title": "Murano Demo", "type": "cirros.demo"}'"""
+ ),
+- }
++ }]
+
+ critical_mapping = {
+ 'primary-controller': True,
+@@ -1062,7 +1062,7 @@ class TestHandlers(BaseIntegrationTest):
+ common_attrs['last_controller'] = controller_nodes[-1]['name']
+ common_attrs['storage']['pg_num'] = 128
+
+- common_attrs['test_vm_image'] = {
++ common_attrs['test_vm_image'] = [{
+ 'container_format': 'bare',
+ 'public': 'true',
+ 'disk_format': 'qcow2',
+@@ -1074,7 +1074,7 @@ class TestHandlers(BaseIntegrationTest):
+ """--property murano_image_info="""
+ """'{"title": "Murano Demo", "type": "cirros.demo"}'"""
+ ),
+- }
++ }]
+
+ critical_mapping = {
+ 'primary-controller': True,
+diff --git a/nailgun/nailgun/test/integration/test_orchestrator_serializer.py b/nailgun/nailgun/test/integration/test_orchestrator_serializer.py
+index 8ce987a..e75b3c2 100644
+--- a/nailgun/nailgun/test/integration/test_orchestrator_serializer.py
++++ b/nailgun/nailgun/test/integration/test_orchestrator_serializer.py
+@@ -2656,12 +2656,12 @@ class BaseDeploymentSerializer(base.BaseIntegrationTest):
+
+ def check_no_murano_data(self):
+ glance_properties = self.serializer.generate_test_vm_image_data(
+- self.env.nodes[0])['test_vm_image']['glance_properties']
++ self.env.nodes[0])['test_vm_image'][0]['glance_properties']
+ self.assertNotIn('murano_image_info', glance_properties)
+
+ def check_murano_data(self):
+ glance_properties = self.serializer.generate_test_vm_image_data(
+- self.env.nodes[0])['test_vm_image']['glance_properties']
++ self.env.nodes[0])['test_vm_image'][0]['glance_properties']
+ self.assertIn('murano_image_info', glance_properties)
+
+
diff --git a/nailgun/nailgun/test/unit/test_tasks_templates.py b/nailgun/nailgun/test/unit/test_tasks_templates.py
index a38e975..9cb9171 100644
--- a/nailgun/nailgun/test/unit/test_tasks_templates.py
@@ -214,6 +299,3 @@ index a38e975..9cb9171 100644
self.assertEqual(jsonutils.loads(cmd), fuel_image_conf)
def test_generate_ironic_bootstrap_keys_task(self):
---
-1.9.1
-
diff --git a/patches/fuel-web/0003-Update-docs-for-qemu-debootstrap.patch b/patches/fuel-web/0003-Update-docs-for-qemu-debootstrap.patch
index b6ab7fe7..5a975fb7 100644
--- a/patches/fuel-web/0003-Update-docs-for-qemu-debootstrap.patch
+++ b/patches/fuel-web/0003-Update-docs-for-qemu-debootstrap.patch
@@ -19,6 +19,3 @@ index 227549c..47b9823 100644
sudo gem install bundler -v 1.2.1
sudo gem install builder
sudo pip install xmlbuilder jinja2
---
-1.9.1
-
diff --git a/patches/fuel-web/0004-direct-kernel-boot-for-cirros.patch b/patches/fuel-web/0004-direct-kernel-boot-for-cirros.patch
new file mode 100644
index 00000000..0d133274
--- /dev/null
+++ b/patches/fuel-web/0004-direct-kernel-boot-for-cirros.patch
@@ -0,0 +1,138 @@
+From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
+Date: Tue, 15 Mar 2016 15:01:51 +0100
+Subject: [PATCH] direct kernel boot for cirros
+
+---
+ nailgun/nailgun/orchestrator/base_serializers.py | 16 +++--
+ .../nailgun/orchestrator/deployment_serializers.py | 70 ++++++++++++++++------
+ 2 files changed, 62 insertions(+), 24 deletions(-)
+
+diff --git a/nailgun/nailgun/orchestrator/base_serializers.py b/nailgun/nailgun/orchestrator/base_serializers.py
+index 16dc3fa..23d6589 100644
+--- a/nailgun/nailgun/orchestrator/base_serializers.py
++++ b/nailgun/nailgun/orchestrator/base_serializers.py
+@@ -36,12 +36,16 @@ class MuranoMetadataSerializerMixin(object):
+ self).generate_test_vm_image_data(node)
+
+ # Add default Glance property for Murano.
+- test_vm_image = image_data['test_vm_image']
+- existing_properties = test_vm_image['glance_properties']
+- murano_data = ' '.join(["""--property murano_image_info='{"title":"""
+- """ "Murano Demo", "type": "cirros.demo"}'"""])
+- test_vm_image['glance_properties'] = existing_properties + murano_data
+- return {'test_vm_image': test_vm_image}
++ test_vm_images = []
++ for test_vm_image in image_data['test_vm_image']:
++ existing_properties = test_vm_image['glance_properties']
++ murano_data = ' '.join(
++ ["""--property murano_image_info='{"title":"""
++ """ "Murano Demo", "type": "cirros.demo"}'"""])
++ test_vm_image['glance_properties'] = existing_properties + \
++ murano_data
++ test_vm_images += [test_vm_image]
++ return {'test_vm_image': test_vm_images}
+
+
+ class VmwareDeploymentSerializerMixin(object):
+diff --git a/nailgun/nailgun/orchestrator/deployment_serializers.py b/nailgun/nailgun/orchestrator/deployment_serializers.py
+index b8b38e2..54b1614 100644
+--- a/nailgun/nailgun/orchestrator/deployment_serializers.py
++++ b/nailgun/nailgun/orchestrator/deployment_serializers.py
+@@ -274,6 +274,9 @@ class DeploymentMultinodeSerializer(object):
+ return {'glance': {'image_cache_max_size': image_cache_max_size}}
+
+ def generate_test_vm_image_data(self, node):
++ images = []
++ # By default always prepare the disk image
++
+ # Instantiate all default values in dict.
+ image_data = {
+ 'container_format': 'bare',
+@@ -297,8 +300,8 @@ class DeploymentMultinodeSerializer(object):
+ arch = "x86_64"
+ elif arch == "arm64":
+ arch = "aarch64"
+- image_data['img_path'] = '{0}cirros-{1}-disk.img'.format(img_dir,
+- arch)
++ image_data['img_path'] = \
++ '{0}cirros-{1}-disk.img'.format(img_dir, arch)
+
+ glance_properties = []
+
+@@ -313,8 +316,38 @@ class DeploymentMultinodeSerializer(object):
+ glance_properties.append('--property hypervisor_type=vmware')
+
+ image_data['glance_properties'] = ' '.join(glance_properties)
+-
+- return {'test_vm_image': image_data}
++ images += [image_data]
++
++ # Now for aarch64 add also kernel and initrd because we direct
++ # kernel boot is used then
++ if arch == 'aarch64':
++ image_data['glance_properties'] += \
++ ' --property os_command_line=\'root=/dev/vda1 rw rootwait' + \
++ 'console=tty0 console=ttyS0 console=ttyAMA0\'' + \
++ ' --property hw_video_model=vga'
++ kernel_data = {
++ 'container_format': 'aki',
++ 'public': 'true',
++ 'disk_format': 'aki',
++ 'img_name': 'TestVM-kernel',
++ 'img_path': '{0}cirros-{1}-kernel'.format(img_dir, arch),
++ 'os_name': 'cirros',
++ 'min_ram': 64,
++ 'glance_properties': '',
++ }
++ initrd_data = {
++ 'container_format': 'ari',
++ 'public': 'true',
++ 'disk_format': 'ari',
++ 'img_name': 'TestVM-initramfs',
++ 'img_path': '{0}cirros-{1}-initramfs'.format(img_dir, arch),
++ 'os_name': 'cirros',
++ 'min_ram': 64,
++ 'glance_properties': '',
++ }
++ images += [kernel_data, initrd_data]
++
++ return {'test_vm_image': images}
+
+ @classmethod
+ def get_net_provider_serializer(cls, cluster):
+@@ -495,20 +528,21 @@ class DeploymentHASerializer61(DeploymentHASerializer,
+ images_data['test_vm_image'] = []
+ if attrs.get('editable', {}).get('common', {}). \
+ get('use_vcenter', {}).get('value') is True:
+- image_vmdk_data = deepcopy(image_data['test_vm_image'])
+- img_path = image_vmdk_data['img_path']. \
+- replace('x86_64-disk.img', 'i386-disk.vmdk')
+- image_vmdk_data.update({
+- 'img_name': 'TestVM-VMDK',
+- 'disk_format': 'vmdk',
+- 'img_path': img_path,
+- })
+- image_vmdk_data['glance_properties'] = ' '.join([
+- '--property vmware_disktype=sparse',
+- '--property vmware_adaptertype=lsiLogic',
+- '--property hypervisor_type=vmware'])
+- images_data['test_vm_image'].append(image_vmdk_data)
+- images_data['test_vm_image'].append(image_data['test_vm_image'])
++ images_vmdk_data = deepcopy(image_data['test_vm_image'])
++ for image_vmdk_data in images_vmdk_data:
++ img_path = image_vmdk_data['img_path']. \
++ replace('x86_64-disk.img', 'i386-disk.vmdk')
++ image_vmdk_data.update({
++ 'img_name': 'TestVM-VMDK',
++ 'disk_format': 'vmdk',
++ 'img_path': img_path,
++ })
++ image_vmdk_data['glance_properties'] = ' '.join([
++ '--property vmware_disktype=sparse',
++ '--property vmware_adaptertype=lsiLogic',
++ '--property hypervisor_type=vmware'])
++ images_data['test_vm_image'] += [image_vmdk_data]
++ images_data['test_vm_image'] += image_data['test_vm_image']
+ else:
+ images_data = image_data
+
diff --git a/patches/fuel-web/0005-FIXME-Disable-amd64-Liberty-on-Ubuntu-for-now.patch b/patches/fuel-web/0005-FIXME-Disable-amd64-Liberty-on-Ubuntu-for-now.patch
new file mode 100644
index 00000000..243d9c85
--- /dev/null
+++ b/patches/fuel-web/0005-FIXME-Disable-amd64-Liberty-on-Ubuntu-for-now.patch
@@ -0,0 +1,24 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Sat, 19 Mar 2016 19:02:15 +0100
+Subject: [PATCH] FIXME: Disable amd64 Liberty on Ubuntu for now.
+
+Until we fix all cohabitation of amd64 and arm64, disable Openstack
+release Liberty on Ubuntu (x86_64) in openstack.yaml fixture.
+
+TODO: maybe rename above fixture to include arch in name.
+---
+ nailgun/nailgun/fixtures/openstack.yaml | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/nailgun/nailgun/fixtures/openstack.yaml b/nailgun/nailgun/fixtures/openstack.yaml
+index 4979fb5..037ceba 100644
+--- a/nailgun/nailgun/fixtures/openstack.yaml
++++ b/nailgun/nailgun/fixtures/openstack.yaml
+@@ -1986,6 +1986,7 @@
+ extend: *base_release
+ fields:
+ name: "Liberty on Ubuntu 14.04"
++ state: "unavailable"
+ version: "liberty-8.0"
+ arch: "amd64"
+ can_update_from_versions: []
diff --git a/patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch b/patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch
index eac38f74..d30a954c 100644
--- a/patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch
+++ b/patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch
@@ -19,6 +19,3 @@ index e11d033..2a81027 100644
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
index 4f6e8966..66668355 100644
--- 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
@@ -41,6 +41,3 @@ index e95dbf2..709ca6b 100644
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
index 9edcd2bb..496acf07 100644
--- a/patches/opnfv-fuel/0003-Add-arm64-deb-repositories-setup.patch
+++ b/patches/opnfv-fuel/0003-Add-arm64-deb-repositories-setup.patch
@@ -156,6 +156,3 @@ index a9e74bc..0266e17 100755
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
index d056a9e0..db92ff2c 100644
--- a/patches/opnfv-fuel/0004-Follow-redirects.patch
+++ b/patches/opnfv-fuel/0004-Follow-redirects.patch
@@ -23,6 +23,3 @@ index 01f6e41..61d41ab 100644
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
index c6820393..1ec568be 100644
--- a/patches/opnfv-fuel/0005-Build-bootstrap-image-for-arm64.patch
+++ b/patches/opnfv-fuel/0005-Build-bootstrap-image-for-arm64.patch
@@ -22,6 +22,3 @@ index b096a78..744f352 100755
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
index 253267d1..2300153b 100644
--- a/patches/opnfv-fuel/0006-bootstrap-Use-public-Ubuntu-ports-mirrors.patch
+++ b/patches/opnfv-fuel/0006-bootstrap-Use-public-Ubuntu-ports-mirrors.patch
@@ -46,6 +46,3 @@ index aa12c45..2e4843d 100644
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
index 130c354d..440d20e5 100644
--- a/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-qemu.patch
+++ b/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-qemu.patch
@@ -19,6 +19,3 @@ index e9c4356..c23e9c2 100644
+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
index dde9c5a0..c427394f 100644
--- a/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-ovsnfv.patch
+++ b/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-ovsnfv.patch
@@ -20,6 +20,3 @@ index 1893fce..f29dab5 100644
+OVSNFV_DPDK_REPO:=https://gerrit.opnfv.org/gerrit/p/ovsnfv.git
OVSNFV_DPDK_DIR=fuel-plugin-ovsnfv
OVSNFV_DPDK_CHANGE=
---
-1.9.1
-
diff --git a/patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch b/patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch
new file mode 100644
index 00000000..dd043892
--- /dev/null
+++ b/patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch
@@ -0,0 +1,24 @@
+From: Florin Dumitrascu <florin.dumitrascu@enea.com>
+Date: Thu, 17 Mar 2016 19:37:19 +0100
+Subject: [PATCH] Allow customizing fuel-plugin-opendaylight
+
+Signed-off-by: Florin Dumitrascu <florin.dumitrascu@enea.com>
+---
+ build/f_isoroot/f_odlpluginbuild/Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile
+index b0bc9c7..cc305e0 100644
+--- a/build/f_isoroot/f_odlpluginbuild/Makefile
++++ b/build/f_isoroot/f_odlpluginbuild/Makefile
+@@ -8,8 +8,8 @@
+ ##############################################################################
+
+ TOP := $(shell pwd)
+-ODL_BRANCH=brahmaputra-release
+-ODL_REPO="https://github.com/openstack/fuel-plugin-opendaylight.git"
++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
diff --git a/upstream/fuel-plugin-opendaylight b/upstream/fuel-plugin-opendaylight
new file mode 100644
index 00000000..32e4fa8c
--- /dev/null
+++ b/upstream/fuel-plugin-opendaylight
@@ -0,0 +1 @@
+Subproject commit 2a24fe8e5ead193dd5ad9f4bec5a2d23db89f681