aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-07-14Merge "Add fuel collectd ceilometer plugin"Guo Ruijing3-1/+104
2016-07-13Merge "Update NSH patches"Michal Skalski1-1/+1
2016-07-13Add fuel collectd ceilometer pluginGuo Ruijing3-1/+104
Change-Id: I2f95d9166e2d0d7508551de8b87dc6c84800e3c1 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
2016-07-12Aligning machine type over Ubuntu and CentosStefan K. Berg12-12/+12
We have previously used "pc-1.0" as the qemu-kvm machine definition for virtual Fuel deploys. On Ubuntu this points to: pc-1.0 Standard PC (i440FX + PIIX, 1996) On CentOS 7 this machine definition does not exist, but there's a match in "pc": pc RHEL 7.0.0 PC (i440FX + PIIX, 1996) (alias of pc-i440fx-rhel7.0.0 So, finally, pc is also in Ubuntu: pc Ubuntu 14.04 PC (i440FX + PIIX, 1996) (alias of pc-i440fx-trusty) This change is about exploring whether moving to "pc" will make the auto deploy work on both platforms with the "pc" machine type. What still needs to be done in CentOS is to create a symlink from /usr/libexec/qemu-kvm and /usr/bin/kvm though. Change-Id: I1cce52a21075950cb59b75709b12d724d759e3e6 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2016-07-12Update NSH patchesGuo Ruijing1-1/+1
1. update patches from commit 307b06d Change-Id: Ibaba101833a934840b4491925ff944f1420fce2e Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
2016-07-08Merge "[BGPVPN] Do not include temporary files in plugin"Michal Skalski1-1/+1
2016-07-08Merge "deploy: ISO rebuild: use -joliet-long names."Michal Skalski1-0/+1
2016-07-08Merge changes from topic 'multiple-nics-for-fuel-vm'Michal Skalski3-15/+28
* changes: deploy: add support for multiple bridges virtual_fuel: prepare class to allow multiple bridges
2016-07-08deploy: ISO rebuild: use -joliet-long names.Alexandru Avadanii1-0/+1
Armband adds similar files, which tend to have long names and only differ in suffixes (e.g. DEBs for amd64 vs arm64). Previous change [1] fixed ISO build errors, but failed to address the deploy.py ISO rebuild (which modifies and recreates the ISO, calling mkisofs, which complains about clashing file indexes). This works around ISO rebuild error(s) like: "genisoimage: Error: ./ubuntu/pool/main/g/golang-gogoprotobuf/golang-gogoprotobuf\ -dev_0.0~git20150828.0.6cab0cc-1~u14.04+mos1_arm64.deb and ./ubuntu/pool/main/g/golang-gogoprotobuf/golang-gogoprotobuf\ -dev_0.0~git20150828.0.6cab0cc-1~u14.04+mos1_amd64.deb have the same Joliet name" [1] https://gerrit.opnfv.org/gerrit/#/c/14973/ Change-Id: If58a18ba46343a52ce6e9a0a6a0482c1a3079451 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-07-08[BGPVPN] Do not include temporary files in pluginMichal Skalski1-1/+1
Change-Id: Idd2e2f403a2dd5be44c480e8b493e4281ade1994 Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-07-08Point to newer commit in ODL plugin repoMichal Skalski1-1/+1
Use small fix for setting ovsdb managers. Change-Id: Ie405d4a2db59ea490ff0a690bb310c0c74d8de79 Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-07-06Point to latest commit in bgpvpn plugin repoMichal Skalski1-1/+1
Currently we use commit before uplift to mitaka. Change-Id: Ie08a548b133aff01cc2457bd74d0fe7a86a18eff Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-07-05[BGPVPN] fpm: Build multiarch DEBs (arch <all>)Alexandru Avadanii1-3/+3
Update upstream reference to include support for building DEB packages for architecture <all> instead of the native one, since apart from one small hardcoded check on Fedora for java version, most code is arch-independant (python). TODO: Extend check for `uname -m` result for aarch64 and other platforms in <networking_odl/devstack/setup_java.sh>. While at it, make git info variable overrideable, just in case we want to patch this out of upstream tree locally. Change-Id: Ia139c8d957f65bb120dca1727fd4a422e2510ea0 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-07-05Fix ODL deploymentsMichal Skalski1-5/+1
Change-Id: Idae02b340d3a64109deeda7ef67574430b928219 Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-07-04Plugin version is requiredMichal Skalski5-9/+19
Plugin version is required when plugin configuration is overwritten. Change-Id: I93af002ed5e994c90b9134f8c020a3822e81e42c Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-07-04Modify the indent in fuel-odl_0.9.0.yaml.wu.zhihui1-142/+142
Change-Id: I15bb84c35c075037df23746b75b108e2d7b90ede Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>
2016-07-01[BGPVPN] Uplift plugin to MitakaNikolas Hermanns6-18/+40
Change-Id: I9db366806ec97b44b0e537ee2d4beb3c8a968b92 Signed-off-by: Nikolas Hermanns <nikolas.hermanns@ericsson.com>
2016-07-01ruby-json is required for fpmMichal Skalski1-1/+1
Change-Id: Ib8a759922879a81a355bca14e3d4beeeb2ad72d4 Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-07-01Fix module versions for scenariosMichal Skalski6-7/+7
Change-Id: Ia5a5d008af717f9b2d0e7495bd2180cdad4075e8 Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-06-30Merge "Use ODL Boron for SFC"Michal Skalski6-579/+42
2016-06-30plugins: ovs, vswperf, yardstick: Allow overrides.Alexandru Avadanii3-9/+9
Allow git info related variables from various plugin config.mk configuration files to be overriden. We rely on this in Armband to apply our patches on top of selected commit(s), then pick up the new (patched) git info. Change-Id: Ib7d9a52f51cef27ec4031587a09a39732a9fbbb4 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-30Use ODL Boron for SFCMichal Skalski6-579/+42
SFC scenario requires OpenDaylight Boron. ODL plugin will be built with both Beryllium and Boron. It will be possible to choose deployment with Boron instead of default Beryllium. Change-Id: I1abd22ddca16e710430accd40ad8359be1bd7132 Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-06-30Uplift fuel and nshovs plugins configsNikolas Hermanns2-0/+194
Change-Id: I86cdef9d3e3337d1b16b9154c940f73b0a3d8567 Signed-off-by: Nikolas Hermanns <nikolas.hermanns@ericsson.com>
2016-06-29Move fuel plugin builder to DockerfileGuo Ruijing9-26/+5
Change-Id: I5c2bc9f4331bedd7a1d3e78ba2f9b82027e566ef Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
2016-06-30Merge "Fix NSH patches"Guo Ruijing1-1/+1
2016-06-29Merge "Use openjdk-8-jre by default"Michal Skalski1-3/+1
2016-06-29Use openjdk-8-jre by defaultMichal Skalski1-3/+1
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-29Fix NSH patchesGuo Ruijing1-1/+1
Change-Id: I04d03ce0b803aa23575dd2640e33eafa00f948bc Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
2016-06-28Use fuel-mirror version which handle 302 redirectsMichal Skalski1-1/+3
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-28Add fuel-plugin-kvm to install kvmfornfvdavidjchou3-29/+32
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 "Add timeout for SCP operations"Jonas Bjurel1-2/+7
2016-06-28Merge "Add fuel@opnfv build based on vagrant"Guo Ruijing4-0/+97
2016-06-26Add timeout for SCP operationsPeter Barabas1-2/+7
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-23Merge "Fix wget failure in fue@opnfv"Guo Ruijing1-1/+1
2016-06-21Add fuel@opnfv build based on vagrantGuo Ruijing4-0/+97
Change-Id: I5d180f060f27d49b03d6b2eda4750845a3490348 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
2016-06-22Fix wget failure in fue@opnfvGuo Ruijing1-1/+1
Change-Id: Ie5940ab758182a23873c0e9a55a83b199f2619ad Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
2016-06-22Add fuel yardstick pluginGuo Ruijing3-1/+107
Change-Id: Ie6a980ad23e43f6eef775c74d005358d4ab859cc Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
2016-06-20Override parameter attempts in Class Zte_Adapter.wu.zhihui1-2/+2
Give more attempts for zte hardware. Change-Id: I0906b6fe9e046ddd6436e5246494b89c812a40a2 Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>
2016-06-17add onos nofeature scenarion mapwuwb19893-0/+223
Change-Id: I5c7d9b712c66860bfbe923396e12641c17d439b5 Signed-off-by: wuwb1989 <wuwenbin2@huawei.com>
2016-06-17deploy: add support for multiple bridgesJosep Puigdemont3-8/+16
deploy.py: Some Fuel VMs may need more than one network interface. To be able to provide that, we now allow the user to specify the "-b" paramter (bridge) multiple times, creating a new NIC for each one of them. The NICs are created in the same order as they are given in the command line. There is no change in behavior from earlier versions, pxebr will still be the default bridge if none is specified in the command line. deploy.sh: To reflect the new capabilities of deploy.py, we introduce the possibility to specify -B more than once in deploy.sh, and honor that when calling deploy.py. We also make it possible to specify a comma separated list of bridges, as in: -B br1,br2. Change-Id: I1a0100f2cfe755ec6adfeedafb391c2357f46f51 Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
2016-06-17virtual_fuel: prepare class to allow multiple bridgesJosep Puigdemont1-8/+13
The VirtualFuel class has now two new methods: del_vm_nics: Deletes all interfaces from the VM. add_vm_nic: Adds a NIC to the VM, attached to the specified bridge. The following method has been deleted: set_vm_nic: implemented with the two new methods Apart from the deleted method, no functionality has been changed. This is just a small but necessary step towards adding support for configuring more than one NIC in the fuel VM. Change-Id: I9f02c8163dfb9768510e78d5d5e77a0bb43306fb Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
2016-06-17vitual_fuel: set_vm_nic() takes no parametersJosep Puigdemont1-1/+1
Fixes: https://jira.opnfv.org/browse/FUEL-148 Change-Id: Id5a1d710abf425e75b6ff9eaa7b372285e200702 Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
2016-06-17Merge "Add OVS with NSH/DPDK build"Guo Ruijing2-2/+2
2016-06-16virtual_fuel: add XML tree as attribute of VirtualFuelJosep Puigdemont1-7/+14
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-16Merge "ipmi_adapter: add delay to stabilize command action"Jonas Bjurel1-0/+1
2016-06-16ipmi_adapter: add delay to stabilize command actionJosep Puigdemont1-0/+1
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-16Merge "Mask ipmitool credentials"Jonas Bjurel1-3/+4
2016-06-16Merge "Mask impitool credentials"Jonas Bjurel1-7/+15
2016-06-16Merge "Add command line argument masking for exec_cmd"Jonas Bjurel1-4/+19
2016-06-16Merge "Remove unused function: usage()"Jonas Bjurel1-7/+0