summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/upstream-backports
AgeCommit message (Collapse)AuthorFilesLines
2017-04-26Cleanup: Remove patches that landed upstreamAlexandru Avadanii1-256/+0
Change-Id: Ib2f96ec70d0b589741484f7e3f3b537a269785fe Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 7a118fca890bd757485bcd1d59f334e5f1e327d3)
2017-04-24fuel, docs: fuel-menu: Align defaults with OPNFVAlexandru Avadanii2-11/+269
Since Armband alters the bootstrap package list and/or kernel version, hanlded previously by fuel_bootstrap_cli.yaml, we need to refactor our patches a bit. NOTE: deploy-cache: We no longer include bootstrap package list in the bootstrap fingerprint; we only rely on the repo mirrors fingerprints, since bootstrap package list is mostly static across release cycles. Upstream-bug: https://bugs.launchpad.net/fuel/+bug/1679636 JIRA: FUEL-266 JIRA: ARMBAND-225 Change-Id: I6c1b090df6eff69d60fa7ca779b3dde527e77879 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 48a9297abfe3b35da1a5c3e8b44a823be24af00e)
2017-04-07cleanup: Fuel: docker: remove obsolete ffi patchAlexandru Avadanii1-40/+0
This patch is no longer needed, since upstream package repos have fixed meanwhile. Change-Id: Ic73d7e60cce6a1a0c152885caeb30f49d68e7441 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 0716a89e4055be29c140044608293ec5a95b08c6)
2017-04-01Revert "fuel: deploy: SFC scenarios: 4.8 krn, no vhost_net"Alexandru Avadanii1-261/+0
This reverts commit 17bda8d52856bece72bf2b446a30ffe4be8e2535. Change-Id: I4358fb5e013e16203f1e824211f3a458ebc59fb5
2017-03-29fuel: deploy: SFC scenarios: 4.8 krn, no vhost_netAlexandru Avadanii1-0/+261
FIXME: Put patch in `upstream-backports` dir for now, so we don't have to edit other patches, to be moved to a more fit location later. Change-Id: Ia2e6e4800844dda0abc19347768a0927e0c3db9f Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-03-29deploy-cache: Use `mco` to set up authorized_keysAlexandru Avadanii1-15/+33
JIRA: ARMBAND-242 Change-Id: I1e8335289a253f5fa2ebb4fb2620b25f10e1b1e9 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 6b5e1a9bc6c1f260e15e0f5698382d8feb992caa)
2017-03-20Add copyright header to patch filesCatalina Focsa4-0/+32
JIRA: ARMBAND-236 Change-Id: I91c4956b5baa479995bff2f569a321b8a0b421c0 Signed-off-by: Catalina Focsa <catalina.focsa@enea.com> (cherry picked from commit 6946d63910d84a8bd453b0dddc07a6cddfb9cd8d)
2017-03-18deploy-cache: Master id_rsa.pub as authkey for envAlexandru Avadanii1-4/+19
JIRA: ARMBAND-242 Change-Id: Ice1091ce701139995418c5899181b09b630c41a9 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 2e922579664feeadf722ce11d4f8b92ffffd3c0c)
2017-02-03Rebase: Adjust patch context for deploy configAlexandru Avadanii1-1/+6
Change-Id: I3d1b15cbfd70d726ae8b24514d2106e7e52e2524 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-02-01docker: fpb: Obsolete src overrideAlexandru Avadanii1-2/+2
Fuel@OPNFV recently applied a better fix for using the latest version of fpb, so obsolete our patch. Change-Id: I088fc31177e5c56ce09712b65a3dbd18eb013ce5 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-01-25deploy-cache: Fix typo in nailgun settings sedAlexandru Avadanii1-1/+1
Previous commit missed adding the "-i" flag to a sed call, rendering the whole effort useless. JIRA: ARMBAND-190 Change-Id: If0724cb99c94530e5eeb140e93759c4a19503908 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-01-24deploy-cache: Relax repo fingerprintingAlexandru Avadanii1-22/+13
JIRA: ARMBAND-206 Change-Id: I054a287593a327fa16941f6c9fec802e9ce2fac8 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-01-24deploy-cache: Sync nailgun settings explicitlyAlexandru Avadanii1-5/+7
/etc/nailgun/settings.yaml AUTHORIZED_KEYS is populated before the bootstrap image (and cached keypair) are injected, so it needs to be synced explicitly. JIRA: ARMBAND-188 JIRA: ARMBAND-190 Change-Id: I8e4004e1ec62ace1dd127ee19127190bc295b0e2 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-01-23deploy-cache: refresh authorized_keys from id_rsaAlexandru Avadanii1-33/+36
When bootstrap cache is present, the cached id_rsa keypair is copied to Fuel Master node after the initial packages are installed (cobbler pp copies id_rsa.pub as /etc/cobbler/authorized_keys). This leaves behind out-of-sync cobbler configuration, generated from the fresh id_rsa.pub instead of the cached one. While at it, also fix Fuel Master authorized_keys from ~/.ssh, which is transferred via /etc/nailgun/settings.yaml to deployed nodes, leading to nodes rejecting subsequent key-based ssh logins. JIRA: ARMBAND-188 JIRA: ARMBAND-190 Change-Id: I58b45c9522b16c7d05dafcd1acaff4b8cc30013e Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-01-21Uplift Armband to Fuel NewtonAlexandru Avadanii8-995/+35
[ Dan Andresan ] - puppet: database: Fix Percona XtraBackup sync [ Alexandru Avadanii ] - disable all plugins; - re-enable remote tracking; - remove "Revert: Point to specific snapshot ..."; - patch context adjustments; - obsolete "kernel-bump", linux-image-lts-xenial is now the default; - network-checker iface state check now fixed upstream [1]; - fuel-nailgun-agent hugepage size should also check /proc/meminfo; - fuel-nailgun-agent CPU detection for AArch64; - nova AArch64 hugepage support is now upstream; - obsolete Cirros Test VM direct kernel boot (by switch to AAVMF): * f-l/0001-upload_cirros-Add-direct-kernel-boot-support.patch * f-w/0001-direct-kernel-boot-for-cirros.patch - rework m1.micro RAM size patch after puppet manifest split upstream; - re-enable arch-agnostic plugins which were rebased in Fuel@OPNFV: * f_yardstick-pluginbuild * f_congress-pluginbuild - do NOT retire MySQL SST provider patch series (nack: ARMBAND-186), rebase (and keep for now) MySQL SST provider patches, as trying to use xtrabackup-v2 revelead a regression since Colorado.3.0, and these patches simplify troubleshooting a lot; - AArch64: nova: libvirt: Use host-model cpu (ARMBAND-193); - AArch64: nova: libvirt: Use pointer_model instead of use_usb_tablet; - m1.micro RAM size insufficient for TestVM with AAVMF (s/128/256/) - switch Cirros TestVM to AAVMF from direct kernel boot; - backport nova libvirt driver fix for deleting instances booted with AAVMF firmware from [2]; TODO (later): - Include ISO build time fixes for cirros_testvm in Armband package; TODO (ODL, later): - test & revise leveldb patching; - bring back Qugga patching for arm64; - configure systemd service to automatically respawn; [1] https://review.openstack.org/#/c/417373/ [2] https://review.openstack.org/#/c/357190/ JIRA: ARMBAND-29 JIRA: ARMBAND-32 JIRA: ARMBAND-63 JIRA: ARMBAND-88 JIRA: ARMBAND-116 JIRA: ARMBAND-118 JIRA: ARMBAND-186 JIRA: ARMBAND-193 JIRA: ARMBAND-194 JIRA: ARMBAND-195 JIRA: ARMBAND-196 JIRA: ARMBAND-197 Change-Id: Ia99022e364e61245d109cabab9d0ed7157b4d2f5 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> Signed-off-by: Dan Andresan <dan.andresan@enea.com>
2016-12-21deploy-cache: Fix home dir expansion in .ssh pathAlexandru Avadanii1-1/+1
JIRA: ARMBAND-184 Change-Id: I26a79ac6c4ec4314fb21fc55b43985488c1b5fde Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-12-20deploy-cache: Fix one more time id_rsa injectAlexandru Avadanii1-1/+1
JIRA: ARMBAND-184 Change-Id: Ie88d1d2a16cbce6987ac12f226e48acc1fc81d9b Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-12-20build: select_ubuntu_repo: break on errAlexandru Avadanii1-0/+70
Backport urgent fix [1] from Fuel@OPNFV to unbreak all CI verify/build jobs in Armband. [1] https://gerrit.opnfv.org/gerrit/#/c/26269/ Change-Id: Icf5a84b62eb39edd922ab98a45b2c26c478466f6 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-12-18deploy-cache: Fix bootstrap id_rsa injectAlexandru Avadanii1-1/+1
JIRA: ARMBAND-184 Change-Id: Ibcc70205f0688ce43e27d6d1361d513f15b4576b Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-12-17sub: packetary: remove, patches upstreamAlexandru Avadanii1-134/+313
Backported from [1] and adapted for Trusty, since Armband did not switch to Ubuntu Xenial / Openstack Newton yet. [1] https://gerrit.opnfv.org/gerrit/#/c/23999/7/ JIRA: ARMBAND-185 Change-Id: I1dd2cec09aa1077a5779573bc54c01db93339ac9 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-12-15fuel-main: Restart sshd service instead of reloadAlexandru Avadanii1-0/+26
Backported from [1] until we switch to Newton and sync again with Fuel@OPNFV master. [1] https://gerrit.opnfv.org/gerrit/#/c/25867/ Change-Id: I0972218eaf7aeb9cb435f6408e140b502fc1c0ed Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-12-12deploy-cache: Fix bootstrap cache locationAlexandru Avadanii1-1/+1
We recently changed the location of the deploy cache artifacts on Fuel Master, which failed to also update the bootstrap_admin_node.sh harcodes. JIRA: ARMBAND-172 Change-Id: I1244beca0b5f386efb7ae255fadb0ef69eb559de Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-12-09deploy-cache: Fix opnfv-bootstraps-cache contentsAlexandru Avadanii1-15/+12
fuel-bootstrap import expects all artifacts to be placed in the archive root dir, so adapt our scripts accordingly. Change-Id: I18ba5cb0f81b1193bc75067ec7c83367f45c0375 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-12-08deploy-cache: Misc fixes and improvementsAlexandru Avadanii1-36/+49
- move cache dir on Fuel Master to /var/cache/opnfv, since /var/lib/opnfv is deleted during env config; - allow target image collection on environment deploy failure too; - create cache directory if missing for bootstrap extraction; JIRA: ARMBAND-172 Change-Id: Icca650e560913345303ca0430a4d8b38183aa0c9 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-12-07Fix failed deploys on virtual pod (noha scenarios)cristinapauna1-53/+627
JIRA: ARMBAND-173 Currently only ha scenarios were successfully deployed on virtual pods The default configuration is for ha scenarios and those have 5 target nodes while on the noha scenarios there are 4. The noha scenarios failed because it was trying to parse one extra node. This patch modifies the dea and dha files for each noha scenario so that the nodes are properly configured. Change-Id: I360aeaf8dc92e0ff614367d47d74f6fa61ef2268 Signed-off-by: cristinapauna <cristina.pauna@enea.com>
2016-12-06deploy-cache: Fix typos in bootstrap collectAlexandru Avadanii1-3/+3
Change-Id: I2d30e72cf218251e1b823619501454a65006dd9d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-12-01deploy-cache: Fixup targetimages extract typoAlexandru Avadanii1-1/+1
JIRA: ARMBAND-172 Change-Id: I9f549e0161d39d8f72fff698cfc26c164b0f10ae Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-11-30CI: deploy-cache: Store and reuse deploy artifactsAlexandru Avadanii1-0/+738
Add support for caching deploy artifacts, like bootstraps and target images, which take a lot of time at each deploy to be built, considering it requires a cross-debootstrap via qemu-user-static and binfmt. For OPNFV CI, the cache will piggy back on the <iso_mount> mechanism, and be located at: /iso_mount/opnfv_ci/<branch>/deploy-cache TODO: Use dea interface adapter in target images fingerprinting. TODO: remote fingerprinting TODO: differentiate between bootstraps and targetimages, so we don't end up trying to use one cache artifact type as the other. FIXME: This is still a bit hacky in some areas, but we need it ASAP. JIRA: ARMBAND-172 Change-Id: Iecd293db98c061325643cc61863a48f092bfd491 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-11-27Correct previous patch on fuel reworkcristinapauna1-20/+28
Some leftover chars in https://gerrit.opnfv.org/gerrit/#/c/24901/ were keeping the deploy to work. Also, the empty folder networks was added. This folder should contain templates for virtual network config for the targets. For arm we don't need those so we leave it empty for consistency with other projects and for avoiding changing the deploy logic JIRA: ARMBAND-122 Change-Id: Id33e2efacc3ff8d3754c8b29d4bebefd0b385c41 Signed-off-by: cristinapauna <cristina.pauna@enea.com>
2016-11-25Fuel rework for multiple libvirtcristinapauna1-0/+938
The current fuel arhitecture assumes that all the VMs (Jenkins slave, Fuel master and Target nodes) are all on the same server. There is code that allows the Fuel master to be on a different machine, but nothing for the Target nodes. In Enea-Arm lab we have a different server for each. This commit also adds specific templates for a virtual pod in the Enea-Arm lab. Therefore, the following changes are done: - The default libvirt URI is the machine on which the Target nodes are - The parameter libvirtUri was added in the dha.yaml file for fuel master - All virsh calls have "-c" option to explicitly specify the uri; this parameter is set only when libvirtUri is explicitly set in the yaml file - The scenarios dha override now point to the arm template files - The network templates are not needed for ARM, as the network infra is provided by the server on which the Target node VMs reside; the folder is added here just for consistency - The target nodes are created with virsh rather than quemu when the nodes are not on the same machine as Jenkins slave (similar logic to what is done for remote Fuel master) JIRA: ARMBAND-122 FIXME: remove hardcodes for - Network bridges from templates - Default pool - libvirtUri from scenario overwrite Change-Id: Ibf4744e5593f5201550115397024fd8311696074 Signed-off-by: cristinapauna <cristina.pauna@enea.com>
2016-11-21local mirror: Add missing vgabios for arm64Alexandru Avadanii1-1/+3
JIRA: ARMBAND-169 Change-Id: I4dbcd044c6c146f541e8c005282a4e60af2c3c8a Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-11-20f_repobuild: Fixup missing OPNFV plugin depsAlexandru Avadanii1-21/+22
Packetary solves "libasound2" with "liboss4-salsa-asound2" from universe, leading to openjdk failing to install. Work around this by altering recently introduced packetary-driven local mirror build to include OPNFV plugin deps into the "main" package list. JIRA: ARMBAND-167 JIRA: ARMBAND-35 Change-Id: I040a7117c7ae809933a400ae00937ab8fcc1ea0e Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-11-15AArch64: Ubuntu local partial mirror: Add arm64Alexandru Avadanii1-0/+643
NOTE: Temporarily patch "packetary" in Armband until we upstream two small fixes. Bootstrap build, deploy target image build: - Switch from public Ubuntu mirrors to 10.20.0.2. JIRA: ARMBAND-35 Change-Id: I14645cfeebb486063e7b8198de273f68285b11cd Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-10-09build: Rework patch mechanism for Fuel submodulesAlexandru Avadanii2-0/+164
While refactoring the patching mechanism, take care of: - Sync submodule handling with Fuel@OPFNV; - build: Investigate/prepare for moving patches to Fuel@OPNFV; - build: Investigate divergent fuel-mirror; - ISO build: cacheid for Fuel comps should not depend on Armband git commit; CHANGE: Rename/shuffle patches while grouping them in "features", preparing for upstreaming them to Fuel@OPNFV and beyond. CHANGE: Allow linking patches for better representing the dependency between one patch and different features. e.g. 0001-Add-arch-to-nailgun-release-and-target-image.patch: - part of `multiarch-fuel`, because it extends Fuel; - part of `direct-kernel-boot`, as arch is required for that; - part of `cross-bootstrap`, target image is arch-dependent; NOTE: Patch links are not staged to Fuel@OPNFV, they only serve as markers that a specific patch is part of a feature. CHANGE: Kill all Fuel component submodules, now handled in Fuel@OPNFV: - fuel-agent - fuel-astute - fuel-library - fuel-mirror - fuel-nailgun-agent - fuel-web CHANGE: Move armband-fuel-config.mk to armband git root. FIXME: m1.micro-Increase-profile-RAM-size-to-128MB.patch is NOT part of `cross-bootstrap` feature, but patch context says so ... FIXME: 0001-Add-arm64-deb-repositories-setup.patch is broken at `make patches-export` by removing spaces at EOL. v2 -> v3: * Phony patch support (links to show a patch belongs to a feature); * Updated README.md v3 -> v7: * Re-export Fuel submodules & plugins patches (update patch context); * Update Cavium mail addresses (s/caviumnetworks.com/cavium.com/); * Ignore submodule changes; * Add armband git repo info to gitinfo_fuel.txt at build time; Implements: ARMBAND-136 Closes-bug: ARMBAND-95 Closes-bug: ARMBAND-93 Closes-bug: ARMBAND-92 Change-Id: I1a236d9f43b2e6dca22055911f696b43c22b5973 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>