aboutsummaryrefslogtreecommitdiffstats
path: root/patches
AgeCommit message (Collapse)AuthorFilesLines
2016-08-22submodule: Kill yardstickAlexandru Avadanii1-5/+1
Since arm64 support has been proposed straight upstream [1], we no longer have to keep the git submodule for the yarstick repo. [1] https://gerrit.opnfv.org/gerrit/#/c/18883/ Change-Id: Ic8a02106ed1d26012a0767fc0444b8f8d35c54aa Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-08-19Merge "Rebase: upstream DEA mechanism changes"Alexandru Avadanii4-185/+29
2016-08-19build: ISO refactor, use docker, enable cacheAlexandru Avadanii8-7/+487
Previously, Armband Makefile used to call Fuel@OPNFV Makefile target <iso>, instead of <all>, which resulted in bypassing using Docker for ISO building completely. Switch to <all> Makefile target, hence bringing back Docker as a build container. This change justifies moving make variables to a separate spec file, armband.mk. While at it, enable caching of builds. This requires Jenkins bash scripts to be updated for the ISO build job, done in [1]. JIRA: ARMBAND-56 [1] https://gerrit.opnfv.org/gerrit/#/c/18453/ CHANGES: - all: release (was all: build) - Common make targets now depend on submodules-init; - clean-build and clean-docker make targets have been replaced by: make clean, make deepclean; FIXME: These issues should be fixed later: - (optional) trim local repo paths from gitinfo files - only account for armband submodules in cache fingerprints; - identify size mismatch culprit Change-Id: I7d73409be44983fa21d4c09d2e07b87a33231e03 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-08-17Rebase: upstream DEA mechanism changesAlexandru Avadanii4-185/+29
Change-Id: I6a8a96caa095b20d85db2d4d418dd9cb121b12e4 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-08-05Merge "def kernel-flavor: linux-image-generic-lts-xenial"Alexandru Avadanii4-35/+118
2016-08-04def kernel-flavor: linux-image-generic-lts-xenialAlexandru Avadanii4-35/+118
Ubuntu arm64: While keeping kernel 4.2 for Trusty (linux-image-generic-lts-trusty), set 4.4 backported from Xenial (linux-image-generic-lts-xenial) as default kernel for Armband ISO. Xenial kernel 4.4 for Trusty has been tested with: - AMD Softiron; - APM Mustang; - Cavium ThunderX; While at it, remove obsoleted rtc-efi fixes. Notes: - keep 4.2 kernel inside the ISO; - selecting 4.2 kernel may be done via deploy settings, by overriding kernel flavor when calling `fuel-bootstrap`; Related-bug: ARMBAND-48 Change-Id: Ice1f95939f0d7d9491befd20030740850b1a0e61 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-08-04Rebase: adapt patches after ovs/dpdk fixAlexandru Avadanii2-4/+2
Upstream change [1] requires us to to adapt our Fuel@OPNFV patches. [1] https://gerrit.opnfv.org/gerrit/#/c/17969/ Change-Id: I9823469df575cc929e399a6025aca6066a16e98d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-08-02Upstream: decouple patches, MakefileAlexandru Avadanii1-324/+0
Change-Id: I78606b3dca803c7bf1d872cf067b2bd5f8a8aa91
2016-08-02Rebase: adapt patch after deploy-config refactor.Alexandru Avadanii1-7/+4
Change-Id: I97c9c79bb342d6c7504414134649795689b5e78b Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-07-28deploy: Fix ssh timeouts after yaml injectAlexandru Avadanii1-11/+17
JIRA: ARMBAND-59 Change-Id: I031e1c20bcb7d5bb15b26dce18364a4994f4d0d7 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-07-28deploy: Allow DEA to override bootstrap configAlexandru Avadanii1-0/+93
Backport from upstream proposed change [1] in Fuel@OPNFV. [1] https://gerrit.opnfv.org/gerrit/#/c/17563/ Prereq for: ARMBAND-48 Change-Id: Ia5a2073532e578b663f8f45bfe90b9fe36df77cc Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-07-27Merge "Restore "Bugfix backport: sysctl.conf vrouter namespace"""Alexandru Avadanii1-0/+54
2016-07-27Restore "Bugfix backport: sysctl.conf vrouter namespace""Alexandru Avadanii1-0/+54
After Fuel@OPNFV pinned Fuel components to 9.0.1 version commits, this patch was silently excluded, causing deploy failures. This reverts commit 58d5b149c539d46e294b07a09702f31991e9c81d. Change-Id: Icd583d1050e89ddf2a1a48d9080596d8c2429eb5
2016-07-26Merge "kernel-flavor: Add linux-image-generic-lts-xenial"Alexandru Avadanii3-40/+27
2016-07-22kernel-flavor: Add linux-image-generic-lts-xenialAlexandru Avadanii3-40/+27
Ubuntu arm64: While keeping kernel 4.2 for Trusty (linux-image-generic-lts-trusty), add 4.4 backported from Xenial (linux-image-generic-lts-xenial) to Armband ISO. Xenial kernel 4.4 for Trusty has been tested with: - AMD Softiron; - APM Mustang; - Cavium ThunderX; While at it, remove obsoleted armband-rtc-efi-fix Debian package, which was only needed on targets that are not compatible with 4.4, and we plan on retiring soon. v2->v3: - keep 4.2 kernel instead of replacing it; - selecting 4.4 kernel will be done via deploy settings, by overriding kernel flavor when calling `fuel-bootstrap`; - dropped test changes, not needed when both 4.2 and 4.4 are in; TODO: - switch default kernel flavor to 4.4 when all our PODs are ready; Closes: ARMBAND-48 Change-Id: I37600f12dd01facbd552f1d2d721bc7a3e0e2750 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-07-22BUILD_ID: Fix git SHA one last time.Alexandru Avadanii1-1/+1
Previous commit which was supposed to fix the BUILD_ID being too long mistakenly altered the submodule code for computing the short SHA, instead of altering the Makefile. Fixes: ARMBAND-53 Change-Id: Ib1c1b3dc9592714fd86a59ae1a64001bd2930bd3 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-07-22BUILD_ID: Fix build ID too long errAlexandru Avadanii1-1/+1
Previous change altered the BUILD_ID to include Armband commit info instead of Fuel@OPNFV info, and also a marker to indicate it comes from Armband repo. This lead to the ISO volume ID becoming too long: "Making ISO... genisoimage: Volume ID string too long make[1]: *** [iso] Error 255" While at it, change our marker from "FUEL_AARCH64" to "ARMBAND_FUEL", as our ISO should also support x86 in the future, not only arm64. Fixes: ARMBAND-53 Change-Id: I52526f1f7861aca71d16d1e6b6b2a9566a6c7d3f Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-07-21Rebase: update patch context after upstream changeAlexandru Avadanii1-1/+1
Change-Id: Ia268e17a7a8b0c2c47209e47feb6f77394036283 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-07-21Rebase: Trim changes for obsoleted mirror patchAlexandru Avadanii1-43/+1
Upstream change [1] removed Czech mirror patch. [1] https://gerrit.opnfv.org/gerrit/#/c/17225/ Change-Id: Id986899aa83b3cb7d228a266b1b8a8f5a942ba49 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-07-21Merge "BUILD_ID: Fix incomplete git build info"Alexandru Avadanii1-0/+35
2016-07-19Merge "fuel-library: Fix virtlogd not started"Alexandru Avadanii1-0/+33
2016-07-19BUILD_ID: Fix incomplete git build infoAlexandru Avadanii1-0/+35
Closes: ARMBAND-53 Change-Id: I92c1541a22a837c281d9b86f6ee8da327305884d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-07-18deploy: Delete old Fuel env if presentAlexandru Avadanii1-0/+58
In order to clean up old partitioning and boot entries on target nodes, before removing the Fuel Master, try ssh-ing into it and removing all environments/nodes. This is especially important for EFI systems, where old boot entries are left behind without a proper env delete, leading to target nodes failing to PXE boot on Fuel Master re-install. This change assumes that: - all Fuel Master information is unchanged between old and new deploy (fuel IP, password etc.); - Fuel Master is up and running, in a sane state (target nodes are also online), when deploy starts; Closes: ARMBAND-51 Change-Id: I52b853b37a0d226a9cb33179f7aeb65eff74da4e Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-07-18fuel-astute: Erase EFI boot entry on EFI systemsAlexandru Avadanii1-0/+43
On EFI-enabled systemd, grub-install from grub-efi-* package installs a boot entry named "ubuntu". Since this boot entry is saved in board flash memory, erasing the MBR bootloader code and/or partition signature will not clear the ubuntu boot entry, leaving it pointing to a loader on the ESP (EFI System Partition) that will try to load the kernel/initrd from an erased partition. In Fuel 8.0, the whole disk was erased, so the ubuntu EFI boot entry was skipped due to missing ESP, while for Fuel 9.0 and above we have to explicitly remove it to keep the system in a sane state. Note: efibootmgr is installed automatically on EFI systems as a dependency of grub-efi-*. Closes: ARMBAND-47 Change-Id: If715e960dfd96df807abb0e26f4b7604624ac408 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-07-16Revert "Bugfix backport: sysctl.conf vrouter namespace"Alexandru Avadanii1-54/+0
Merged upstream. This reverts commit 31087865b416f0eab066377c76a0d580d3fd8bd1. Change-Id: I60bd902207bb35e244e0e10646226d9f611bd68a
2016-07-15fuel-library: Fix virtlogd not startedAlexandru Avadanii1-0/+33
libvirt >= 1.3.0 installs additional services, including virtlogd, which need to be started explicitly after install, as the Ubuntu UCA package is currently broken. Fuel code already carries a fix for this, but only for UCA libvirt. Refactor the condition for the existing fix to check package version instead of origin. Closes-bug: https://jira.opnfv.org/browse/ARMBAND-37 Change-Id: I651ab48072ddcbfb88ce78a66c25cb524e442981 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-07-14Bugfix backport: sysctl.conf vrouter namespaceAlexandru Avadanii1-0/+54
Upstream bug report [1], proposed change backported from [2]. Temporary backport proposed fix until fuel-library merges it. Currently net.ipv4.ip_nonlocal_bind is not set inside vrouter namespace. This can lead to deployment failure with p_dns error: ocf-ns_dns: INFO: dnsmasq daemon is not running ocf-ns_dns: ERROR: dnsmasq: failed to create listening socket for 10.109.5.1: Cannot assign requested address ocf-ns_dns: ERROR: Error. dnsmasq daemon returned error 0. We had very similar issue in the past: https://bugs.launchpad.net/fuel/+bug/1500871 We need to add ocf_run $RUN_IN_NS /sbin/sysctl -w net.ipv4.ip_nonlocal_bind=1 To get_ns() in ns_dns and ns_vrouter [1] https://bugs.launchpad.net/fuel/+bug/1595957 [2] https://review.openstack.org/#/c/334415/ Change-Id: Id8d3a2e58de4dccc9a79536bd443294e085f70ff Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-07-13fuel@opnfv: honor pod's interfaces/transformsJosep Puigdemont1-0/+85
Change-Id: I493279d81b32a58b918f2b6caa0cf869a0caa674 Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
2016-07-13leveldb: Use odl_package var for ODL pkg version.Alexandru Avadanii1-1/+1
Change-Id: I220b364d2aecc5e08b3c90c451acf26e5d8ea0d7 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-07-12Merge "Fuel VM: set virtio cache to writeback"Alexandru Avadanii1-1/+1
2016-07-12Merge "iptables: Move SSH rules to post-scripts."Alexandru Avadanii2-3/+48
2016-07-12Fuel VM: set virtio cache to writebackJosep Puigdemont1-1/+1
Change-Id: Icbbba0bee68a8fe9de76dbf3c339e01da43fb3a2 Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
2016-07-12iptables: Move SSH rules to post-scripts.Alexandru Avadanii2-3/+48
Previous change [1] introduced the addition of an iptables rule that was supposed to allow SSH access on all ifaces (not only admin iface) when additional ifaces are configured. However, Fuel installer is flushing the rules after transplant adds our SSH config, overwriting it. Move iptables SSH config to post-install section, as standalone script. In order to keep the same behavior, test ifcfg-eth0 (admin interface is expected to be called eth0 by convention) for "DEFROUTE=no" and only whitelist SSH on all ifaces if it matches. [1] https://gerrit.opnfv.org/gerrit/#/c/16571/ Change-Id: I086b75461daa62671cad10494fe34acfd77757ae Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-07-12ODL wget: --no-check-certificate for local cache.Alexandru Avadanii1-0/+42
Change-Id: Idbc45b4d1aeddf5450b756d23faf56c95fccc975
2016-07-11Merge "transplant.py: Allow SSH on all interfaces."Alexandru Avadanii1-5/+3
2016-07-11dea_base: use grub-efi-arm64 instead of grub-pc.Josep Puigdemont1-0/+22
Change-Id: Iae462ebe89ff3bc351addd12a8f5cc5ecdef2b11 Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
2016-07-08patches: removed patches upstreamed to fuel@opnfvJosep Puigdemont2-192/+0
Change-Id: I2cd1899d82878dfece22ed546e1ff24d5387e8c1 Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
2016-07-07transplant.py: Allow SSH on all interfaces.Alexandru Avadanii1-5/+3
Previously (in Fuel 8.0), SSH used to listen only on 10.20.0.2 (admin interface), which required editing sshd_config and restarting SSH server for allowing SSH connections over the public IP on eth1 (just an example, which corresponds to Armband PODs use cases). In Fuel 9.0, SSH server on Fuel Master listens on all ifaces, but connections are filtered by iptables. This change piggy-backs on a previous Armband addition that allows transplant.py script to configure additional interfaces (e.g. public). In case additional interfaces have been configured by transplant, this change will instruct iptables to accept SSH connections on ANY interface, not only the admin one. Possible improvements: - limit SSH access to admin + interfaces added by transplant instead of ANY; Change-Id: I0923496e1b23f6dc826c8afbbe9805956c2d4b34 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-07-07Temporary: HACK: SR-IOV: Fix VNIC filtering.Alexandru Avadanii1-0/+35
FIXME: Revert this when upstream Fuel 9.1 closes bug [1]. [1] https://bugs.launchpad.net/fuel/+bug/1597775 Change-Id: I692b0ef63ee3e035deadef9d4e47b43f4c53e4aa Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-07-06Backport: dpkg-checkbuilddeps to mk-build-deps.Alexandru Avadanii1-0/+71
For some reason, our docker sandbox builder already has dh-systemd when checking for "fuel-agent" build-deps, and therefore skips adding it as a build dep inside the chroot, leading to debuild fail. Backporte upstream fix for this from [1]. [1] https://review.openstack.org/#/c/325210/ Change-Id: Ieece9b2250bd91e688bd0f203240da5234930558 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-07-05ODL: Rework opnfv-quagga building/packaging.Alexandru Avadanii2-30/+91
My initial goal was to split the ODL patch in two patches: - leveldb + leveldbjni arm64 support; - opnfv-quagga building/packing for multiple archs (UBUNTU_ARCH); However, due to the design of opnfv-packaging repo, it is easier to: - patch upstream sources to support native arm64 builds (see [1]); - add prebuilt arm64 binaries to output dir in git repo (like amd64), submitted as pull request upstream [2]; Until above OPNFV-QUAGGA changes land upstream or are refactored, rely on forked repository that contains above patches [3] on branch "stable/colorado". opnfv-quagga patch adding UBUNTU_ARCH parsing is more or less there to detect missing DEBs, rather than filter prebuilt DEBs, which for now only cover "amd64 arm64". [1] https://github.com/nikolas-hermanns/opnfv-quagga-packaging/pull/1 [2] https://github.com/nikolas-hermanns/opnfv-quagga-packaging/pull/2 [3] https://github.com/alexandruavadanii/opnfv-quagga-packaging Change-Id: I022c1e82531d82422486f2041c70a3f50b6ca386 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-07-01Rebase: Deal with upstream ODL Boron + OVS bump.Alexandru Avadanii4-68/+1
Change-Id: Iea330d6d778ff5034e1e801d20fa74485e302a95 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-29Merge "ODL plugin: rebase for JAVA8."Alexandru Avadanii1-45/+9
2016-06-29submodule: yardstick.Alexandru Avadanii1-0/+22
Fuel@OPNFV just added the Yardstick plugin. This plugin is a little different, instead of breaking fuel plugin code apart from the contents (i.e. fuel-plugin-yardstick separate from yardstick itself), it holds both fuel plugin metadata and actual yardstick code in the same repo. So far, yardstick plugin code itself is arch-independant and should not be touched. TODO: - add yardstick patches for arm64 until we can validate Yardstick; - submit patches added locally in Armband to upstream (Yardstick@OPNFV); Change-Id: I24bc8858b92c9bdd529a64de833d7b98c06a6ade Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-29ODL plugin: rebase for JAVA8.Alexandru Avadanii1-45/+9
Upstream change [1] required a rebase of our patch and also transitioning leveldb build to using JAVA8. FIXME: Transform JAVA_HOME hardcodes into something like (see [1]): JAVA_HOME=$(readlink -f /usr/bin/java | sed "s:/jre/bin/java::") https://gerrit.opnfv.org/gerrit/#/c/16091/ Change-Id: I7ea6e3989e575754a389115d44cc44e4c416b4d9 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-29vswitchperf: Arch-indep build.Alexandru Avadanii2-0/+64
FIXME: dpdk, ovs, qemu etc. building only supports x86 for now. TODO: conf dir should be patched too. Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-28submodule: vswitchperf.Alexandru Avadanii1-0/+23
Change-Id: I986bfb5ae549321a0696f945d24ccb1b6b198f96 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-28Merge "submodule: fuel-plugin-ovs."Alexandru Avadanii1-0/+22
2016-06-28Rework: Drop fuel-main submodule.Alexandru Avadanii2-44/+87
Move fuel-main patching to opnfv-fuel, preparing for upstreaming this to Fuel@OPNFV. Drop fuel-main submodule! Change-Id: I12b995f37701658dca1d1a212ede029d0e03231c Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-28Merge "Backport git based patching from Fuel@OPNFV."Alexandru Avadanii5-137/+417