aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-06-29Updated armbandMichal Skalski1-0/+0
Project: fuel 968be12920f42828632b41594ec25940bb4e4213 Use openjdk-8-jre by default Package openjdk-8-jre-headless is now a part of mos repositories, opendaylight depends on it now. Change-Id: I27bf15d9e8e4361691c742e71a3f8293f0359f70 Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-06-28Updated armbandMichal Skalski1-0/+0
Project: fuel 9fb25d41bd6487e3e34529381d35493ef67bec85 Use fuel-mirror version which handle 302 redirects Fix is currently in master branch of fuel-mirror, I am not sure when backport to mitaka branch will be aproved, so for now lets point to specific commit. Change-Id: I5215707b477df1b6e8735e62cb392aa1400e8bc2 Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-06-28Updated armbanddavidjchou1-0/+0
Project: fuel e8928f93b50df3ecb11942ab754bae848c082c6a Add fuel-plugin-kvm to install kvmfornfv 1. The installer function for kvmfornfv was in fuel-plug-qemu in Brahmaputra release, it will be in this new fuel-plugin-kvm for Colorado release for clarity 2. Deleted f_qemupluginbuild sub-directory 3. Two "# fix me" for "@sudo rm -rf kvmfornfv" instead of "@rm -rf kvmfornfv" in Makefiel are the temp workgrounds for some files generated during kvmfornfv building are owned by "root", will remove these workarounds after resolving this issue in fuel-plugin-kvm build process Change-Id: I8a1e2dfaff692dc9813afb5d3bf038170871cade Signed-off-by: davidjchou <david.j.chou@intel.com>
2016-06-28Merge "submodule: fuel-plugin-ovs."Alexandru Avadanii4-0/+28
2016-06-28Rework: Drop fuel-main submodule.Alexandru Avadanii5-51/+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
2016-06-28Updated armbandJonas Bjurel1-0/+0
Project: fuel 105fa8c0d40e241c206e37755f13aebb2e137ebd Add timeout for SCP operations The default timeout for SCP is 5 seconds, which is not enough in some cases. Change-Id: If44669a96ea4b5ce33441eeea36b8cf66a1cdc4a Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-06-28Updated armbandGuo Ruijing1-0/+0
Project: fuel 82d7776efa109d031412baa91e91b3b91bbb06fb Add fuel@opnfv build based on vagrant Change-Id: I5d180f060f27d49b03d6b2eda4750845a3490348 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
2016-06-26submodule: fuel-plugin-ovs.Alexandru Avadanii4-0/+28
2016-06-23Updated armbandGuo Ruijing1-0/+0
Project: fuel f2656175b7aff1aa7ef5b32e6dfdf1858b612102 Fix wget failure in fue@opnfv Change-Id: Ie5940ab758182a23873c0e9a55a83b199f2619ad Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
2016-06-23Updated armbandGuo Ruijing1-0/+0
Project: fuel c1d3d423c43b0e52970749e450b03151704506ac Add fuel yardstick plugin Change-Id: Ie6a980ad23e43f6eef775c74d005358d4ab859cc Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
2016-06-22Fix: nova patching: broken puppet chain.Alexandru Avadanii1-1/+1
This was an interesting bug. The code has been broken for a while, but we did not notice because nova was installed before these puppets were ran. With the Mitaka reworks and changes in the puppet manifests, this bug surfaced, but manifested as `virtlogd` service not being started, looking like a libvirt 1.3+ problem. So, just add the missing "->" in the troubling puppet file. Change-Id: Ic702e17e8f732bf7a277714cc4416e0f2ee68cfe Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-20Merge "Makefile: Fix and update docker-clean."Alexandru Avadanii1-3/+9
2016-06-20Backport git based patching from Fuel@OPNFV.Alexandru Avadanii5-137/+417
Rebase conflicting patches due to format change. Change-Id: Ia9d1f9c0cad77da7b95e8ec4b62324953ef3ce9c Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-20Updated armbandwu.zhihui1-0/+0
Project: fuel 5514b02b38df42f7d954c63f4c74ecf8fbf368f8 Override parameter attempts in Class Zte_Adapter. Give more attempts for zte hardware. Change-Id: I0906b6fe9e046ddd6436e5246494b89c812a40a2 Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>
2016-06-19Merge "Fix: upload_cirros hash mixup."Alexandru Avadanii1-10/+23
2016-06-19Merge "f-m: Remove qemu-user-static."Alexandru Avadanii2-57/+9
2016-06-18Makefile: Fix and update docker-clean.Alexandru Avadanii1-3/+9
Change-Id: I468f4e37057e812c85034b16748a8083d0c96ab4 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-18Fix: upload_cirros hash mixup.Alexandru Avadanii1-10/+23
Change-Id: Ibd41229ce744256fc289756708d64c3fedede9f4 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-18Merge "Fix: reap.py: puppet-managed ifcfg files."Alexandru Avadanii1-1/+3
2016-06-17f-m: Remove qemu-user-static.Alexandru Avadanii2-57/+9
Previously, we added and used qemu-user-static and its wrapper over debootstrap (qemu-debootstrap) in: - requirements-rpm.txt No longer needed, qemu-user-static should be added automatically as a cobbler rpm dependency (similar to cobbler-grub-aarch64); - prepare-build-env.sh No longer needed, we only support building packages natively. We never built an arm64 chroot at ISO build time. - sandbox.mk Same motivation as above, no longer needed. I think this would have needed qemu-user-static on build machine, and binfmt properly set up on that machine as well, adding complexity to the build process, although we do not use it. So, simplify things a little and prepare this for upstream. Change-Id: Idfce5aa594f1fcd92b1f238c7d07cb88f26064b8 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-17Merge "Fix: f-l: upload_cirros glance cmd, syntar err."Alexandru Avadanii3-27/+44
2016-06-17Fix: reap.py: puppet-managed ifcfg files.Alexandru Avadanii1-1/+3
Skip parsing comment lines in ifcfg-ethX files at reap, e.g.: Change-Id: Ide6b2111619f7558f1434fda5cd254b842cef0ae Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
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-17Updated armbandwuwb19891-0/+0
Project: fuel 4de621898db6e81ca1d0faf3ebd6f41a953be29a add onos nofeature scenarion map Change-Id: I5c7d9b712c66860bfbe923396e12641c17d439b5 Signed-off-by: wuwb1989 <wuwenbin2@huawei.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>