summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-06-17Fix: f-l: upload_cirros glance cmd, syntar err.Alexandru Avadanii3-27/+44
While at it split another patch in f-l in two. Change-Id: Ife31a94447176798c3cf7052408ffeddb1e753ff Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-17opnv-fuel: updated deploy patch setJosep Puigdemont11-207/+178
Change-Id: I9442f217d2f840382b40f6eae77ddb9ae2ddbadc Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
2016-06-17Updated armbandJosep Puigdemont1-0/+0
Project: fuel dc7f16e0fa9545021b2673e18eff421221ba06c0 vitual_fuel: set_vm_nic() takes no parameters Fixes: https://jira.opnfv.org/browse/FUEL-148 Change-Id: Id5a1d710abf425e75b6ff9eaa7b372285e200702 Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
2016-06-17Updated armbandGuo Ruijing1-0/+0
Project: fuel 109b0e70eb9963fd5d4aa8e7fda3cc30ec7752b9 Add OVS with NSH/DPDK build Change-Id: I6cdcc56024a4d9fe305783f45856f388e62c0ba8 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
2016-06-16Updated armbandJosep Puigdemont1-0/+0
Project: fuel b0670cfd013bf0ef4a1c1b3723fa3f5da6dd108d virtual_fuel: add XML tree as attribute of VirtualFuel With this patch, the VM XML definition tree is an attribute of the object, this way it can be used by all methods without having to re-read the file. Methods added: update_vm_template_file: Flushes the contents of the in-memory XML representation of the VM to the backing file. Change-Id: I18d3f606b0c02cd589cb0f657599e8b03b0e817e Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
2016-06-16Updated armbandJonas Bjurel1-0/+0
Project: fuel b86d8e65f9a8a3e52a7f06f8ac9d32963c9df6d4 ipmi_adapter: add delay to stabilize command action We should allow the nodes some time to stabilize after sending a command to them. Currently we are checking the status too fast. Change-Id: I26a60d2bb6a43edbec842b727f825057e2778981 Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
2016-06-16Updated armbandJonas Bjurel1-0/+0
Project: fuel 523ae3b3247412daff4c127f505fc64d6dc67696 Mask ipmitool credentials Change-Id: I328432e6b30437e8a83065859cd80358d4c3c468 Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-06-16Updated armbandJonas Bjurel1-0/+0
Project: fuel 7994abe6083f408823149669fa2e51ef7d341a8e Mask impitool credentials Change-Id: I0103082672259eaf4b1c2be8ca3a1236fc6137eb Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-06-16Updated armbandJonas Bjurel1-0/+0
Project: fuel f2c53cb47c52f295568639919c407080ecf92b03 Add command line argument masking for exec_cmd exec_cmd() now takes 2 additional optional arguments: mask_args and mask_str. The former expects an array of positions to mask, the latter expects a string to be used as mask. Change-Id: I445141a68929a0d2837e7692ce8b4d071154cfa7 Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-06-16Updated armbandJonas Bjurel1-0/+0
Project: fuel aace3a2620c1c49932c7c82ed6cc154c78d19bef Remove unused function: usage() Change-Id: I648821262a7bfd77e59f4411380020c49306ff5e Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-06-16Updated armbandJonas Bjurel1-0/+0
Project: fuel 294150c7f9e36477ff0a25f947fb2c8002999a3b Introducing collection of all fuel and stack deployment logs. The purpose of this patch is to collect all available Fuel snapshots- and stack/node ldeployment logs for later off-line troubleshooting. The intention is that Jenkins, or other deployment robots will be able to collect all logs from the deployment and store it at some repository where developers can fetch it and perform off-line post deployment trouble-shooting. Following script arguments have been added: CI Arg changes: Added an argument to ci/deploy.sh: -L [Deploy log path and file name], E.g. -L ~/jenkins/deploy/deploy-888.log.tar.gz This will create an tar gzip archive at the path and filename pointed out. If -L is not specified, the log archive will be placed under the CI directory with the following name convention: deploy-YYMMDD-HHMMSS.log.tar.gz Fuel Internal deploy changes: Added an argument to ci/deploy.py -log [Deploy log path and file name], E.g. -log ~/jenkins/deploy/deploy-888.log.tar.gz This will create an tar gzip archive at the path and filename pointed out. If -log is not specified, the log archive will be placed under the CI directory with the following name convention: deploy-YYMMDD-HHMMSS.log.tar.gz READY TO MERGE! VERIFIED! Change-Id: Icb75d9d2e66bdd47f75dcca29071943444d5c823 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2016-06-16Updated armbandJonas Bjurel1-0/+0
Project: fuel 58b6866358c503f6ac588629b705867863523e69 Clarify docker installation instructions Change-Id: I8738798eac64c44a66e4fcab9758094e26a5a69f Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-06-16Updated armbandPeter Barabas1-0/+0
Project: fuel 7361290e6eef010ee646d98f90b3c3fa00ee2b38 Add missing package dependency: libyaml-dev Change-Id: I058f6bc54e1c6b0a0c20eeaa2ea09f2f9a2e80ce Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-06-15Merge "Rebase: f-l: vga nova patch after upstream change."Alexandru Avadanii1-4/+5
2016-06-15Rebase: f-l: vga nova patch after upstream change.Alexandru Avadanii1-4/+5
Change-Id: I4f029b00b03c665bef2bbf367953e9d95ed215f1 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-15Upstream: remote-libvirt + custom tags.Alexandru Avadanii8-669/+0
Change-Id: I3702648583983ac7afcfef7a9556fcd33e984457 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-15Updated armbandJonas Bjurel1-0/+0
Project: fuel 3cddf277c5966c5cc584a493d5923cc5dcdc7820 virtual_fuel: initial support for remote libvirt With this patch it should be possible to create a fuel VM on a remote libvirt server by properly defining the LIBVIRT_DEFAULT_URI [1] environment variable. If the variable is not defined, then there should be no percievable change in behaviour for the script. This patch introduces the ability to create volumes (images) on a remote libvirt host where the Fuel VM is to be deployed. For now the volumes are created by default in a pool named jenkins, but the idea is to allow this to be configured, probably in the POD's DHA file. Since all virsh commands honor LIBVIRT_DEFAULT_URI, we use this environment variable to detect wheter we should create a volume or not. The rationale being that the variable will only be set if the user wants to to do the VM deployment on a remote libvirt host. We need to create a volume because we can not rely on being able to access the remote server's file system directly. The images are then transferred to the libvirt host using virsh commands. All this could also be done using scp and a user directory on the host machine, but using pools allows us to take advantage of libvirt's policies and file permissions. CHANGE: when LIBVIRT_DEFAULT_URI is defined, the script will not check for the presence of the required PXE bridge. This will still be checked when the Fuel VM is started and the bridge not found, but this happens at a later point than it does today. CHANGE: before this patch, the file system image was named like the VM: vm_name.raw. This patch introduces a change and adds a timestamp suffix to the image: vm_name-timestamp.raw. This is so to avoid collisions with an image with the same name on the remote pool (two PODs may be using the same pool). It may also be useful to keep around old file system images. FIXME: This patch requires a pool named "jenkins" in the remote libvirt server, and it will fail if it is not present. This should be configurable. Notice though that we can still define LIBVIRT_DEFAULT_URI as "qemu:///system" to create the Fuel VM on the local host. [1] https://libvirt.org/remote.html#Remote_URI_reference Change-Id: I40925ed31337d3ad9cf505f284f5c3d14e9129a0 Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
2016-06-15Updated armbandJonas Bjurel1-0/+0
Project: fuel f09f2e3c661b8fcb1c82151e1ad17eea7275b417 VirtualFuel: Add temp_dir and vm_name attributes These two variables are defined in one of the methods right now. They will be useful to other methods too, so we add them as attributes to the object here. Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com> virtual_fuel: make vm_template an attribute Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com> virtual_fuel: factor out image creation into a method Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
2016-06-15Updated armbandJonas Bjurel1-0/+0
Project: fuel aa58ccd04bfa98ae2bfbf2e37a180020e331deaf common.py: allow specifying number of attempts in exec_cmd Some commands executed by exec_cmd may fail because of a temporary cause, and it may be desirable to retry the same command several times until it succeeds. One example of this are the ipmitool commands, which may fail temorarily on some targets if they get too many requests simultaneously. In this patch three new optional parameters are introduced to the function signature, which do not break backward compatibility: attempts: which indicates how many times the command should be run if it returns a non-zero value*, and defaults to 1 (as today). delay: which indicates the delay in seconds between attempts, and defaults to 5 seconds. verbose: It will print the remaining attempts left for the current command if set to True. * It may be desirable to add yet another parameter to indicate what return value should be considered an error, but non-zero for now seems a reasonable default. Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com> ipmi_adapter: simplify, retry if command fails The method get_node_state has been added to the the IpmiAdapter class. In addition, now the power on/off methods will try several times to perform their IPMI command before giving up, instead of bailing out at the first error. After the power on/off command is completed, the method will wait until the node is in the desired state. NOTE: a command could potentially take several minutes if the defaults are used; each IPMI command can take up to 1 minute, and there can be 3 commands issued per operation, one of them may be retried 20 times with the current defaults. Ideally we would use eventlet or something similar to allow each command a limited time to execute, instead: with eventlet.timeout.Timeout(seconds) as t: power_on/off_command Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
2016-06-15Updated armbandAlexandru Avadanii1-0/+0
Project: fuel c47a7f7a0198e2ce6ba54cbe485ae87983f785d2 ODL build: Allow customizing JAVA URL For Armband, JAVA8_URL hardcode needs to be patched outside of the build system, so make related var overrideable. Change-Id: I308074a4ae0c5f8b22e5e5128965ce90fea3734e Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> Signed-off-by: Stanislaw Kardach <Stanislaw.Kardach@cavium.com>
2016-06-15Merge "Fix: f-l: usb_table borked rebase."Alexandru Avadanii1-2/+2
2016-06-15Merge "Upstream: IPMI port + Mitaka mirror."Alexandru Avadanii2-248/+0
2016-06-15Updated armbandJonas Bjurel1-0/+0
Project: fuel f9e8c1a361d3673df9fcde83e46d265ed49fa499 repobuild: Allow customizing fuel-mirror repo URL For Armband, fuel-mirror code needs to be patched outside of the build system, so we factor out the repo URL into an overrideable variable (FUEL_MIRROR_URL). Change-Id: Icf26f1b84f5a653f541819a42980377f51c7f299 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> Signed-off-by: Stanislaw Kardach <Stanislaw.Kardach@cavium.com>
2016-06-15Updated armbandAlexandru Avadanii1-0/+0
Project: fuel ba99c6e97a4dc9db8165edc7d95a254892f59830 Build: Allow customizing FUEL_MAIN_TAG (commit) FUEL_MAIN_TAG is currently hard set to 9.0 (not overridable). While this is a sane assumption for the usual scenarios, Armband applies a series of patches on top of Fuel@OPNFV, hence requiring us to override this variable. WARNING: FUEL_MAIN_TAG is reused for fuel-mirror tag, so if you override this variable, make sure the same tag exists in fuel-mirror. Change-Id: Ided75cf0c3b5ad18cf7ef1ec88b5d2dc3aada511 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> Signed-off-by: Stanislaw Kardach <Stanislaw.Kardach@cavium.com>
2016-06-15Fix: f-l: usb_table borked rebase.Alexandru Avadanii1-2/+2
I messed up the identation and missed a semicolon during rebase. Change-Id: I7142721cc57115a72c93bcfd270c03d6cb04c399 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-15Upstream: IPMI port + Mitaka mirror.Alexandru Avadanii2-248/+0
Change-Id: I3c7bd7f9be85078783a2e95dfe480cffc08534d1 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-15Updated armbandMichal Skalski1-0/+0
Project: fuel 301ce6a92c82f65df08d75995d35316005e38ff9 Build local mirrors for stable/mitaka Change-Id: I3128652aeb87cb2cfaa91ded1b8d9ebeeb70d33b Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-06-15Updated armbandAlexandru Avadanii1-0/+0
Project: fuel a2ee8e7efc66be53645c8b1d7c43b7740bc999cd deploy: ipmi adapter: Add <port> config support. Sometimes the IPMI lanplus protocol listens on a non-standard remote port, e.g. when target nodes are interfaced through a fake IPMI BMC application that listens on multiple ports on the same IP address. Therefore, allow setting IPMI port in the DHA using a new property named `ipmiPort`, and pass it along to `ipmitool` when set. CHANGE: get_access_info now also supports specifying the IPMI port to use with `ipmitool` by configuring the `ipmiPort` property in the DHA. hp_adapter.py: updated `get_access_info` return signature with the new (unused there) `ipmiport`. Change-Id: I620176bd7f466aa460518cf12d15ccbe86a22560 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-15Updated armbandwuwb19891-0/+0
Project: fuel 8b192597ef66f45a820886bfe2489548a9fa807f build and deploy onos plugin for fuel9 Change-Id: I04dd8b4bdddc5678b158d7287c6ffc52d1bce135 Signed-off-by: wuwb1989 <wuwenbin2@huawei.com>
2016-06-14Updated armbandJonas Bjurel1-0/+0
Project: fuel 53ddd94cc6a61c4121300b529209662755f36b5a Enable vsperf plugin in fuel 9.0 Change-Id: I96b59e22fcc0269aa3ae0b04587c8ca7d0fab867 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
2016-06-14Updated armbandJonas Bjurel1-0/+0
Project: fuel eb299372fbb32f93cac6c92060e37bd21c7d8ba0 Update configuration for fuel 9 virtual deployment in Huawei-China. Change-Id: I9d2fc979886510c165af8dbac93ddcdc954727cf Signed-off-by: wuwenbin2 <wuwenbin2@huawei.com>
2016-06-14Updated armbandStefan K. Berg1-0/+0
Project: fuel dac2b89d574c21951a82e9408e58e5b92ac33763 Fixing erroneous hypervisor type A "qemu" snuck in instead of "kvm". Change-Id: Ibe704103cd1bab6e127a31d08d53f53518033539 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2016-06-14Merge "Rebase for "Improve reliability of upload_cirros""Alexandru Avadanii3-44/+29
2016-06-14Merge "Makefile: git submodules should track remotes."Alexandru Avadanii1-1/+1
2016-06-13Updated armbandStefan K. Berg1-0/+0
Project: fuel 406636f26873d551c1adcf10275d0064c22d2b40 Updated devel-pipeline DEA overrides for Fuel 9.0 Minor fix in the ELX version. Update to Fuel 9.0 in the default version. Change-Id: Ic084b86e7f6d2dfc3d15b10f0ef72e04ef2b7bf6 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2016-06-13Rebase for "Improve reliability of upload_cirros"Alexandru Avadanii3-44/+29
Upstream change "Improve reliability of upload_cirros.rb" [1] allows us to drop the "Increase upload_cirros timeout" patch, and also requires rebasing our direct kernel boot patch. Also squashed in a small context edit for an unrelated patch. [1] https://review.openstack.org/#/c/327792/ Change-Id: I8adc30a74714414fae55bc7b81bc0f69f41735ce Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-13Makefile: git submodules should track remotes.Alexandru Avadanii1-1/+1
Instead of binding git submodules to a specific commit, track their remote origins at `make submodules-init`. This introduces the risk of upstream changes breaking our patches more frequently (used to be whenever we bumped submodules by hand), and requiring rebasing, but that already happens for Fuel@OPNFV. This represents a major improvement in tracking upstream and moving away from forking, at the expense of more frequent rebasing, until we upstream or move to post-installation step all our patches. For example, since we rebased our modules 1-2 weeks ago, quite a few patches landed upstream (e.g. [1]) that we missed in our builds. [1] https://bugs.launchpad.net/fuel/+bug/1587773 Change-Id: I2d9e0877513558c86f68875f03976002f757e5ee Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-13Updated armbandStefan K. Berg1-0/+0
Project: fuel eb94725aae686ac519070f00ee9628ae0725d00f Modification of deployment config for Fuel 9 and ELX lab Change-Id: I380087889cda079a56c8cea3acc13145dcd49046 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2016-06-13Updated armbandStefan Berg1-0/+0
Project: fuel c6da8551bcdc1762a3135fcaabee7e5f98e6fcb9 Revert "Temporary fix for PXE booting from the wrong NIC" This reverts commit 5926bcddca0eca28a33ae43aadf90b9263ae6b84. Change-Id: Ibea4ca5d38ce2e10ab6d5bb1d7ccdf666ee149d5 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2016-06-13Updated armbandDaniel Smith1-0/+0
Project: fuel b598e13d935c29e5bbc3d2be3a2731b2b63d3ec5 Temporary fix for PXE booting from the wrong NIC Change-Id: I1f6d38da24d5a4e66061b9bdfe576fbbda7fb624 Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-06-13Merge "Rework: Move m1.micro RAM bump to post-install."Alexandru Avadanii2-35/+38
2016-06-13Merge "Rework: Move nailgun timeout patch to postinstall"Alexandru Avadanii2-27/+36
2016-06-13Merge "Cleanup: Drop obsoleted hardcode, now in fixture."Alexandru Avadanii1-31/+0
2016-06-13Merge "Fix: f-w: Nailgun `current_release` obsoleted."Alexandru Avadanii1-3/+2
2016-06-12Rework: Move m1.micro RAM bump to post-install.Alexandru Avadanii2-35/+38
Change-Id: I158c58cb01112d2113a75dd425275cf9531d49fc Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-12Rework: Move nailgun timeout patch to postinstallAlexandru Avadanii2-27/+36
Change-Id: I927bb36b0ac4628630f90649027441a895c6f774 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-12Rework: Move xz/gzip switch to post-install.Alexandru Avadanii2-35/+52
This is highly unlikely to be upstreamed in any other form than this. Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-12Fix: f-w: Nailgun `current_release` obsoleted.Alexandru Avadanii1-3/+2
Upstream fuel-web change "Remove legacy patching code" [1] obsoletes `current_release` definition in `deployment_serializers.py`. Update our nailgun patch that adds arch field to no longer rely on this functionality. [1] https://review.openstack.org/#/c/280708/ Change-Id: I93b3691be860427da320c5c0a2c799dcc4158afd Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-12Rework: Move fuel-astute patch to post-install.Alexandru Avadanii5-37/+49
IMPORTANT: Drop `fuel-astute` submodule, and patch it instead during the Fuel Master node bootstrapping process, using an OPNFV post.d script. Luckily, this fits well with the recently added script that prepares FM for cross-building. One step closer to un-forking. Change-Id: Ia612e0ad4077b16baf54f1b9ebf9d207daca0be4 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-10Cleanup: Drop obsoleted hardcode, now in fixture.Alexandru Avadanii1-31/+0
We used to change the harcoded grub-pc with grub-efi-arm64, but since Mitaka now adds package list overrides in fixtures [1], we may remove this obsolete patch. [1] https://github.com/openstack/fuel-web/commit/ 4ee42effe27694bd231663e3d0f10c0c42877177 Change-Id: I6707b4dbf3823f356c7ff2367215a41e287b80ac Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>