summaryrefslogtreecommitdiffstats
path: root/patches
AgeCommit message (Collapse)AuthorFilesLines
2016-09-05Rebase: fuel-mirror upstream changesAlexandru Avadanii1-3/+1
Slight rebase after upstream change [1]. FIXME: While looking at [1], I noticed that Armband is not using the proper fuel-mirror version due to our divergent patch & build system. This should be fixed later. [1] https://gerrit.opnfv.org/gerrit/#/c/20317/ Change-Id: I55798ba1004312cd737b6613744683437e98865a (cherry picked from commit b4d5044e751801507738dc02d116436d909d2248) Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-09-05submodule: Kill fuel-astuteAlexandru Avadanii1-4/+1
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 376c76d05862ed38edeb217cd9480807571491a7) Change-Id: I376c76d05862ed38edeb217cd9480807571491a7
2016-09-05EFI: Move patches to Fuel@OPNFV, upstream prepAlexandru Avadanii4-157/+198
Now we can kill fuel-astute submodule. Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit dff8f1a78db4a04dd30c2e0ac03a36cb0b198aa7) Change-Id: Ie049062bb7a41adfbb056894c0a6f411a2d8c254
2016-09-02patches, docs: Remove MySQL WSREP SST providerAlexandru Avadanii2-103/+0
xtrabackup issues have been fixed with the latest version of percona-xtrabackup DEBs we added to linux.enea.com, so remove MySQL WSREP SST provider patches and corresponding docs. Closes-bug: ARMBAND-52 Change-Id: I743e9b6ed242cf15e3063d7dcf7e05d0cee198f2 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 8a696682b3fd0cb5f32ddaca8ede5db7b001a57f)
2016-09-01Upstream: extra interfaces cfgAlexandru Avadanii2-205/+0
Change-Id: Ibd522813a40a0b1c385c47e65f77b1a13c860269 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 6be72ecc09f8465469a0a304ffbd6abc47a12915)
2016-08-31Merge "Upstream: multiarch mirrors" into stable/coloradoAlexandru Avadanii2-280/+0
2016-08-31Merge "Upstream: delete old Fuel env if present" into stable/coloradoAlexandru Avadanii1-58/+0
2016-08-31Merge "Upstream: Fuel@OPNFV pulled patches" into stable/coloradoAlexandru Avadanii4-157/+0
2016-08-31docker: build: Fix docker connectivity lossAlexandru Avadanii1-15/+11
Change-Id: Iaabd176f4032494c8ea40fd1264dafcac01b4a43 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 662822c6f09be5b23dc3f39f85ee2f21a6d3d405)
2016-08-31Upstream: multiarch mirrorsAlexandru Avadanii2-280/+0
Change-Id: Ia54bd3955a3e3b534d8c4d8380de5870a106edc5 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit e799e8f3912dac025e5be5e8c748df8b68b7d06d)
2016-08-31Upstream: Fuel@OPNFV pulled patchesAlexandru Avadanii4-157/+0
Change-Id: Ic584d9b1eb179009256de8ccacfb7669976823c6 (cherry picked from commit 7236ccc7f9fcb9163562d88455c80339fa6efd58)
2016-08-31Upstream: delete old Fuel env if presentAlexandru Avadanii1-58/+0
Change-Id: I308eb1c2bfdf0fc568e7f351078cd7a3017aae4a Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 3483c7fbcc24adeec5fea80c47cceb460325efc0)
2016-08-29build: docker: Use host's network stackAlexandru Avadanii1-0/+32
Armband build benefits (or should have) of a local mirror for "linux.enea.com", which we used to inject into the build system by host's "/etc/hosts". After Armband switched to building inside docker, this change was silently discarded by containerization. The proposed solution uses hosts's network stack in all build containers. See [1] for full description. This change simplifies the network abstraction during build by NOT containerizing the containers' networking. The original motivation was pointing to local mirrors via host's "/etc/hosts", for which an alternative solution could be passing "-v /etc/hosts:/etc/hosts". [1] https://docs.docker.com/v1.8/articles/networking/ Change-Id: I31e3c787a432af49b4799f561669a0150668b222 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 6ae4e120c5f6aab6834e0ec42599e1b409a9af05)
2016-08-25Merge "fpb: Temporary fix for supporting multiple DEB ver" into stable/coloradoAlexandru Avadanii2-1/+56
2016-08-25Rebase: Account for ODL plugin upstream changesAlexandru Avadanii1-1/+1
Change-Id: I854bedd7dd61cf10239f8592336a86b92d78d0bc Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 0ef09dd55010b86fd5cc709cb9520e1a9d686c12)
2016-08-23fpb: Temporary fix for supporting multiple DEB verAlexandru Avadanii2-1/+56
Backport fpb change submmited in [1]. [1] https://review.openstack.org/#/c/311031/ Change-Id: I02ce8c6151799e3953587fce50cbe552a5c95c50 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit c2dd0b63510e4e882021360ab5f0287b6fc3c597)
2016-08-23Merge "Rebase: Upstream renamed ODL to FUEL_PLUGIN_ODL" into stable/coloradoAlexandru Avadanii1-3/+3
2016-08-22Rebase: Upstream renamed ODL to FUEL_PLUGIN_ODLAlexandru Avadanii1-3/+3
See Fuel@OPNFV change [1]. [1] https://gerrit.opnfv.org/gerrit/#/c/19033/ Change-Id: I9c95a7aaec366c9e03620f1129b3cb8401385476 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit bde411ba1cccf4a0827df115deb97f2a9cfade13)
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> (cherry picked from commit 629f39b6928c3cb36d25dc07347de47d601e847e)
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>