fuel.git
8 years agoUse ODL Be SR3 41/18141/1
Michal Skalski [Mon, 8 Aug 2016 10:30:48 +0000 (12:30 +0200)]
Use ODL Be SR3

JIRA: FUEL-165

Change-Id: I483f23c2f74313020d6a3dbb88079558d6674010
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
8 years agoMerge "Fix OVS scenarios to use fuel-plugin-ovs"
Michal Skalski [Mon, 8 Aug 2016 10:08:55 +0000 (10:08 +0000)]
Merge "Fix OVS scenarios to use fuel-plugin-ovs"

8 years agoMerge "Don't use -f flag with docker tag"
Michal Skalski [Mon, 8 Aug 2016 07:32:41 +0000 (07:32 +0000)]
Merge "Don't use -f flag with docker tag"

8 years agoMerge "Allow to use Intel NICs for DPDK on Ericsson POD2"
Michal Skalski [Fri, 5 Aug 2016 10:13:27 +0000 (10:13 +0000)]
Merge "Allow to use Intel NICs for DPDK on Ericsson POD2"

8 years agoDon't use -f flag with docker tag 53/18053/4
Michal Skalski [Thu, 4 Aug 2016 19:35:39 +0000 (21:35 +0200)]
Don't use -f flag with docker tag

-f flag has been deprecated since v1.10.0 and is removed from v1.12.0.
If user use recent version of docker iso built will fail.

https://docs.docker.com/engine/deprecated/#/f-flag-on-docker-tag

JIRA: FUEL-163

Change-Id: If42781f342d59db7672322ec07063d09a23e1dcb
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
8 years agoFix OVS scenarios to use fuel-plugin-ovs 13/16913/16
Fedor Zhadaev [Tue, 12 Jul 2016 09:59:07 +0000 (12:59 +0300)]
Fix OVS scenarios to use fuel-plugin-ovs

 * Use fuel-nshovs instead deprecated fuel-nfvovs
 * Modified scenario to enable DPDK via Fuel
 * Removed hard dependency from specific POD

 * Add ability to merge networks lists

JIRA: FUEL-156
JIRA: FUEL-162

Change-Id: Ie609ff140f1de96e54df37dd9b1881afec792317
Depends-On: Ic6072d938e09a40516c32cdde6223d0a21e57403
Signed-off-by: Fedor Zhadaev <fzhadaev@mirantis.com>
8 years agoAllow to use Intel NICs for DPDK on Ericsson POD2 69/17969/2
Michal Skalski [Wed, 3 Aug 2016 14:56:31 +0000 (16:56 +0200)]
Allow to use Intel NICs for DPDK on Ericsson POD2

JIRA: FUEL-161

Change-Id: I009ba7e9587f3c47d8e609c96b0666394887929e
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
8 years agoFix config for no-ha kvm scenario 63/17963/1
Michal Skalski [Wed, 3 Aug 2016 12:35:26 +0000 (14:35 +0200)]
Fix config for no-ha kvm scenario

JIRA: FUEL-157

Change-Id: I09e595902b2c467b5522b7b37a772f7ab35c8cea
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
8 years agoMerge "Add collectd package for collectd ceilometer plugin"
Michal Skalski [Wed, 3 Aug 2016 09:11:40 +0000 (09:11 +0000)]
Merge "Add collectd package for collectd ceilometer plugin"

8 years agobuild: fuel-main: Decouple patches, Makefile. 59/15859/6
Alexandru Avadanii [Fri, 17 Jun 2016 23:09:27 +0000 (01:09 +0200)]
build: fuel-main: Decouple patches, Makefile.

Tested in armband, with very small adaptions.

Use `git apply` and/or `git am` in favor of `patch`.
Change patches from old context format to unified diff.

This change allows us to decouple Makefile and patches.
This means we no longer have to manually stage touched files
before committing them to git.

Possible improvements:
- move patches to separate dir and add ordering info (prefix);
- merge patches (currently we have one per touched file);

Remove obsolete (unused?) patch:
- fuel-main_docker_version.patch

Change-Id: I5b621370993b259779c813b47105f632948e6da7
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
8 years agoMerge "Add functionality to generate a base DEA file"
Michal Skalski [Tue, 2 Aug 2016 09:20:05 +0000 (09:20 +0000)]
Merge "Add functionality to generate a base DEA file"

8 years agoMerge "Make it possible to include files in templates"
Michal Skalski [Tue, 2 Aug 2016 09:19:44 +0000 (09:19 +0000)]
Merge "Make it possible to include files in templates"

8 years agoMerge "Refactor deploy-config.py"
Michal Skalski [Tue, 2 Aug 2016 09:19:16 +0000 (09:19 +0000)]
Merge "Refactor deploy-config.py"

8 years agoAdd functionality to generate a base DEA file 13/17413/3
Peter Barabas [Fri, 22 Jul 2016 12:27:48 +0000 (14:27 +0200)]
Add functionality to generate a base DEA file

 - Add template file for base DEA

Change-Id: I8055087b992fdc9850852bad9fa07a4e4fde0085
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
8 years agoMake it possible to include files in templates 81/17881/1
Peter Barabas [Mon, 1 Aug 2016 12:41:29 +0000 (14:41 +0200)]
Make it possible to include files in templates

Change-Id: I45c42ac65cfbe6562f0035df3375a2231148e22e
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
8 years agoRefactor deploy-config.py 95/17395/13
Peter Barabas [Fri, 22 Jul 2016 06:49:06 +0000 (08:49 +0200)]
Refactor deploy-config.py

 - fix vertical whitespace
 - more consistent function naming
 - clean up file writes
 - break up some long lines
 - typo fixes
 - remove duplicate spaces
 - unify print's

Change-Id: I5517747ef9f2e39ade7fb553ae2b1547fdf7b9e1
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
8 years agoFix configuration for kvm scenario 41/17641/2
Michal Skalski [Wed, 27 Jul 2016 16:33:53 +0000 (18:33 +0200)]
Fix configuration for kvm scenario

JIRA: FUEL-157

Change-Id: I5baafd4395a2d298a24cccda042d5b43824ae7a0
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
8 years agoMerge "Fix default value for plugin metadata"
Michal Skalski [Tue, 26 Jul 2016 08:36:27 +0000 (08:36 +0000)]
Merge "Fix default value for plugin metadata"

8 years agoMerge "Add ability to override node attributes"
Michal Skalski [Tue, 26 Jul 2016 08:35:16 +0000 (08:35 +0000)]
Merge "Add ability to override node attributes"

8 years agoMerge "Update collectd ceilometer fuel plugin installation scripts"
Guo Ruijing [Tue, 26 Jul 2016 00:16:20 +0000 (00:16 +0000)]
Merge "Update collectd ceilometer fuel plugin installation scripts"

8 years agoMerge "Minor fixes in yardstick fuel plugin"
Guo Ruijing [Tue, 26 Jul 2016 00:16:08 +0000 (00:16 +0000)]
Merge "Minor fixes in yardstick fuel plugin"

8 years agoAdd templating support for generating config files 67/16567/13
Peter Barabas [Thu, 7 Jul 2016 15:40:28 +0000 (17:40 +0200)]
Add templating support for generating config files

 - Remove unneeded method
 - Write result to a file and not STDOUT
 - Add documentation
 - Remove trailing whitespace
 - Documentation corrections

Change-Id: I7532222d3512380c4f1129bd05dc2ba37b409dc2
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
8 years agoAdd ability to override node attributes 95/17195/4
Fedor Zhadaev [Wed, 20 Jul 2016 07:03:21 +0000 (10:03 +0300)]
Add ability to override node attributes

Fixes https://jira.opnfv.org/browse/FUEL-152

Change-Id: I444bf3aef54ffd53c53431e2795b11b10545f55f
Signed-off-by: Fedor Zhadaev <fzhadaev@mirantis.com>
8 years agoPinning down exact Fuel 9.0.1 repo versions 25/17225/6
Michal Skalski [Wed, 20 Jul 2016 12:27:06 +0000 (14:27 +0200)]
Pinning down exact Fuel 9.0.1 repo versions

stable/mitaka branch is open for new commits for Fuel 9.1. To not be
impacted by new upstream changes point to specific commits which were
used for Fuel 9.0 General Availabilit (9.0.1).

JIRA: https://jira.opnfv.org/browse/FUEL-153
verify: no-cache

Change-Id: I7fd8d2f11e4be6f47e39924913c48bfe7d4f2eb3
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
8 years agoTemporary fix for bgpvpn plugin builds 09/17309/1
Michal Skalski [Thu, 21 Jul 2016 08:37:21 +0000 (10:37 +0200)]
Temporary fix for bgpvpn plugin builds

JIRA: FUEL-154

Change-Id: Iad554aef8db9a6d01c408c0014dabf45e4c1a0e6
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
8 years agoUpdate the commit ID of kvmfornfv upstream for fuel-plugin-kvm 53/17253/1
davidjchou [Wed, 20 Jul 2016 11:01:43 +0000 (04:01 -0700)]
Update the commit ID of kvmfornfv upstream for fuel-plugin-kvm

This version of kvmfornfv upstream fixed the issue of failing to launch
instances in Horizon after OPNFV environment deployed.

Change-Id: I05fa9f977924ee679312c599ee0bccabaf7bf1a9
Signed-off-by: davidjchou <david.j.chou@intel.com>
8 years agoAdd collectd package for collectd ceilometer plugin 93/16893/2
Guo Ruijing [Thu, 14 Jul 2016 00:23:06 +0000 (08:23 +0800)]
Add collectd package for collectd ceilometer plugin

Change-Id: I8da0087d8f17f5f2e4c3275a26ad2ca164878226
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
8 years agoFix default value for plugin metadata 93/17193/1
Fedor Zhadaev [Wed, 20 Jul 2016 05:46:42 +0000 (08:46 +0300)]
Fix default value for plugin metadata

Fix typo which result in error while getting default metadata
in case if it's not overridden in scenario.

Fixes https://jira.opnfv.org/browse/FUEL-151

Change-Id: Ibf40f846919155e27da5dc1f778f72afee79ff12
Signed-off-by: Fedor Zhadaev <fzhadaev@mirantis.com>
8 years agoMinor fixes in yardstick fuel plugin 83/17183/1
Guo Ruijing [Wed, 20 Jul 2016 03:10:31 +0000 (11:10 +0800)]
Minor fixes in yardstick fuel plugin

Change-Id: Ifc4a31efc8a2717eaccb7b39fa36e1282eb16173
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
8 years agoUpdate collectd ceilometer fuel plugin installation scripts 79/17179/1
Guo Ruijing [Wed, 20 Jul 2016 02:23:42 +0000 (10:23 +0800)]
Update collectd ceilometer fuel plugin installation scripts

Change-Id: I4019b2167092f522a3d2533bf20b2ea04bb3b2b2
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
8 years agoBuild new cache when list of packages has changed 03/17103/1
Michal Skalski [Sat, 16 Jul 2016 18:16:17 +0000 (20:16 +0200)]
Build new cache when list of packages has changed

Create a new cache of f_repobuild job when list of packages required by
plugins has changed.

JIRA: FUEL-150

Change-Id: I079950eaa9e3b32ea7baa3f6d4a37cc37f99f3a7
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
8 years agoMerge "Update fuel yardstick plugin 1. update fuel plugin builder 2. change insta...
Guo Ruijing [Mon, 18 Jul 2016 08:33:39 +0000 (08:33 +0000)]
Merge "Update fuel yardstick plugin   1. update fuel plugin builder   2. change install directory in yardstick plugin   3. update README"

8 years agoMerge "Add fuel collectd ceilometer plugin"
Guo Ruijing [Thu, 14 Jul 2016 08:13:32 +0000 (08:13 +0000)]
Merge "Add fuel collectd ceilometer plugin"

8 years agoMerge "Update NSH patches"
Michal Skalski [Wed, 13 Jul 2016 14:16:53 +0000 (14:16 +0000)]
Merge "Update NSH patches"

8 years agoUpdate fuel yardstick plugin 27/16727/2
Guo Ruijing [Tue, 12 Jul 2016 22:35:43 +0000 (06:35 +0800)]
Update fuel yardstick plugin
  1. update fuel plugin builder
  2. change install directory in yardstick plugin
  3. update README

Change-Id: I8d717ef568aeaa7958cd1a3161d4ef8ca17a1de1
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
8 years agoAdd fuel collectd ceilometer plugin 55/16655/2
Guo Ruijing [Tue, 12 Jul 2016 17:32:42 +0000 (01:32 +0800)]
Add fuel collectd ceilometer plugin

Change-Id: I2f95d9166e2d0d7508551de8b87dc6c84800e3c1
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
8 years agoAligning machine type over Ubuntu and Centos 29/16729/1
Stefan K. Berg [Tue, 12 Jul 2016 08:54:17 +0000 (10:54 +0200)]
Aligning machine type over Ubuntu and Centos

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>
8 years agoUpdate NSH patches 17/16717/1
Guo Ruijing [Mon, 11 Jul 2016 20:58:27 +0000 (04:58 +0800)]
Update NSH patches

1. update patches from commit 307b06d

Change-Id: Ibaba101833a934840b4491925ff944f1420fce2e
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
8 years agoMerge "[BGPVPN] Do not include temporary files in plugin"
Michal Skalski [Fri, 8 Jul 2016 16:29:17 +0000 (16:29 +0000)]
Merge "[BGPVPN] Do not include temporary files in plugin"

8 years agoMerge "deploy: ISO rebuild: use -joliet-long names."
Michal Skalski [Fri, 8 Jul 2016 16:16:33 +0000 (16:16 +0000)]
Merge "deploy: ISO rebuild: use -joliet-long names."

8 years agoMerge changes from topic 'multiple-nics-for-fuel-vm'
Michal Skalski [Fri, 8 Jul 2016 16:14:15 +0000 (16:14 +0000)]
Merge changes from topic 'multiple-nics-for-fuel-vm'

* changes:
  deploy: add support for multiple bridges
  virtual_fuel: prepare class to allow multiple bridges

8 years agodeploy: ISO rebuild: use -joliet-long names. 21/16621/1
Alexandru Avadanii [Fri, 8 Jul 2016 15:26:51 +0000 (17:26 +0200)]
deploy: ISO rebuild: use -joliet-long names.

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>
8 years ago[BGPVPN] Do not include temporary files in plugin 97/16597/1
Michal Skalski [Fri, 8 Jul 2016 08:39:36 +0000 (10:39 +0200)]
[BGPVPN] Do not include temporary files in plugin

Change-Id: Idd2e2f403a2dd5be44c480e8b493e4281ade1994
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
8 years agoPoint to newer commit in ODL plugin repo 91/16591/1
Michal Skalski [Fri, 8 Jul 2016 07:53:23 +0000 (09:53 +0200)]
Point to newer commit in ODL plugin repo

Use small fix for setting ovsdb managers.

Change-Id: Ie405d4a2db59ea490ff0a690bb310c0c74d8de79
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
8 years agoPoint to latest commit in bgpvpn plugin repo 29/16429/1
Michal Skalski [Wed, 6 Jul 2016 08:42:04 +0000 (10:42 +0200)]
Point to latest commit in bgpvpn plugin repo

Currently we use commit before uplift to mitaka.

Change-Id: Ie08a548b133aff01cc2457bd74d0fe7a86a18eff
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
8 years ago[BGPVPN] fpm: Build multiarch DEBs (arch <all>) 73/16373/1
Alexandru Avadanii [Tue, 5 Jul 2016 12:45:53 +0000 (14:45 +0200)]
[BGPVPN] fpm: Build multiarch DEBs (arch <all>)

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>
8 years agoFix ODL deployments 59/16359/1
Michal Skalski [Tue, 5 Jul 2016 10:21:42 +0000 (12:21 +0200)]
Fix ODL deployments

Change-Id: Idae02b340d3a64109deeda7ef67574430b928219
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
8 years agoPlugin version is required 19/16319/3
Michal Skalski [Mon, 4 Jul 2016 08:20:21 +0000 (10:20 +0200)]
Plugin version is required

Plugin version is required when plugin configuration is overwritten.

Change-Id: I93af002ed5e994c90b9134f8c020a3822e81e42c
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
8 years agoModify the indent in fuel-odl_0.9.0.yaml. 15/16315/1
wu.zhihui [Mon, 4 Jul 2016 07:20:51 +0000 (15:20 +0800)]
Modify the indent in fuel-odl_0.9.0.yaml.

Change-Id: I15bb84c35c075037df23746b75b108e2d7b90ede
Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>
8 years ago[BGPVPN] Uplift plugin to Mitaka 07/16107/5
Nikolas Hermanns [Wed, 29 Jun 2016 09:16:51 +0000 (11:16 +0200)]
[BGPVPN] Uplift plugin to Mitaka

Change-Id: I9db366806ec97b44b0e537ee2d4beb3c8a968b92
Signed-off-by: Nikolas Hermanns <nikolas.hermanns@ericsson.com>
8 years agoruby-json is required for fpm 55/16255/1
Michal Skalski [Fri, 1 Jul 2016 11:34:05 +0000 (13:34 +0200)]
ruby-json is required for fpm

Change-Id: Ib8a759922879a81a355bca14e3d4beeeb2ad72d4
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
8 years agoFix module versions for scenarios 43/16243/1
Michal Skalski [Fri, 1 Jul 2016 07:59:22 +0000 (09:59 +0200)]
Fix module versions for scenarios

Change-Id: Ia5a5d008af717f9b2d0e7495bd2180cdad4075e8
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
8 years agoMerge "Use ODL Boron for SFC"
Michal Skalski [Thu, 30 Jun 2016 21:55:56 +0000 (21:55 +0000)]
Merge "Use ODL Boron for SFC"

8 years agoplugins: ovs, vswperf, yardstick: Allow overrides. 95/16195/1
Alexandru Avadanii [Mon, 20 Jun 2016 15:49:51 +0000 (17:49 +0200)]
plugins: ovs, vswperf, yardstick: Allow overrides.

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>
8 years agoUse ODL Boron for SFC 73/16173/3
Michal Skalski [Thu, 30 Jun 2016 13:53:30 +0000 (15:53 +0200)]
Use ODL Boron for SFC

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>
8 years agoUplift fuel and nshovs plugins configs 77/16177/1
Nikolas Hermanns [Thu, 30 Jun 2016 14:20:59 +0000 (16:20 +0200)]
Uplift fuel and nshovs plugins configs

Change-Id: I86cdef9d3e3337d1b16b9154c940f73b0a3d8567
Signed-off-by: Nikolas Hermanns <nikolas.hermanns@ericsson.com>
8 years agoMove fuel plugin builder to Dockerfile 81/14281/3
Guo Ruijing [Wed, 29 Jun 2016 18:57:11 +0000 (11:57 -0700)]
Move fuel plugin builder to Dockerfile

Change-Id: I5c2bc9f4331bedd7a1d3e78ba2f9b82027e566ef
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
8 years agoMerge "Fix NSH patches"
Guo Ruijing [Thu, 30 Jun 2016 00:42:35 +0000 (00:42 +0000)]
Merge "Fix NSH patches"

8 years agoMerge "Use openjdk-8-jre by default"
Michal Skalski [Wed, 29 Jun 2016 09:28:20 +0000 (09:28 +0000)]
Merge "Use openjdk-8-jre by default"

8 years agoUse openjdk-8-jre by default 91/16091/1
Michal Skalski [Wed, 29 Jun 2016 07:37:37 +0000 (09:37 +0200)]
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>
8 years agoFix NSH patches 89/16089/1
Guo Ruijing [Wed, 29 Jun 2016 06:24:25 +0000 (14:24 +0800)]
Fix NSH patches

Change-Id: I04d03ce0b803aa23575dd2640e33eafa00f948bc
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
8 years agoUse fuel-mirror version which handle 302 redirects 51/16051/1
Michal Skalski [Tue, 28 Jun 2016 13:10:52 +0000 (15:10 +0200)]
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>
8 years agoAdd fuel-plugin-kvm to install kvmfornfv 83/15983/3
davidjchou [Fri, 24 Jun 2016 10:42:47 +0000 (03:42 -0700)]
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>
8 years agoMerge "Add timeout for SCP operations"
Jonas Bjurel [Tue, 28 Jun 2016 11:44:23 +0000 (11:44 +0000)]
Merge "Add timeout for SCP operations"

8 years agoMerge "Add fuel@opnfv build based on vagrant"
Guo Ruijing [Tue, 28 Jun 2016 00:42:50 +0000 (00:42 +0000)]
Merge "Add fuel@opnfv build based on vagrant"

8 years agoAdd timeout for SCP operations 89/15989/1
Peter Barabas [Sun, 26 Jun 2016 10:15:25 +0000 (12:15 +0200)]
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>
8 years agoMerge "Fix wget failure in fue@opnfv"
Guo Ruijing [Thu, 23 Jun 2016 04:43:14 +0000 (04:43 +0000)]
Merge "Fix wget failure in fue@opnfv"

8 years agoAdd fuel@opnfv build based on vagrant 31/15931/2
Guo Ruijing [Wed, 22 Jun 2016 05:30:09 +0000 (22:30 -0700)]
Add fuel@opnfv build based on vagrant

Change-Id: I5d180f060f27d49b03d6b2eda4750845a3490348
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
8 years agoFix wget failure in fue@opnfv 93/15893/6
Guo Ruijing [Mon, 20 Jun 2016 20:26:36 +0000 (20:26 +0000)]
Fix wget failure in fue@opnfv

Change-Id: Ie5940ab758182a23873c0e9a55a83b199f2619ad
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
8 years agoAdd fuel yardstick plugin 01/15901/2
Guo Ruijing [Tue, 21 Jun 2016 16:15:56 +0000 (00:15 +0800)]
Add fuel yardstick plugin

Change-Id: Ie6a980ad23e43f6eef775c74d005358d4ab859cc
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
8 years agoOverride parameter attempts in Class Zte_Adapter. 75/15875/1
wu.zhihui [Mon, 20 Jun 2016 11:59:40 +0000 (19:59 +0800)]
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>
8 years agoadd onos nofeature scenarion map 95/15795/2
wuwb1989 [Fri, 17 Jun 2016 06:53:49 +0000 (14:53 +0800)]
add onos nofeature scenarion map

Change-Id: I5c7d9b712c66860bfbe923396e12641c17d439b5
Signed-off-by: wuwb1989 <wuwenbin2@huawei.com>
8 years agodeploy: add support for multiple bridges 29/15729/4
Josep Puigdemont [Fri, 6 May 2016 02:32:06 +0000 (04:32 +0200)]
deploy: add support for multiple bridges

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>
8 years agovirtual_fuel: prepare class to allow multiple bridges 69/15669/4
Josep Puigdemont [Fri, 20 May 2016 08:23:45 +0000 (10:23 +0200)]
virtual_fuel: prepare class to allow multiple bridges

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>
8 years agovitual_fuel: set_vm_nic() takes no parameters 91/15791/1
Josep Puigdemont [Fri, 17 Jun 2016 06:26:53 +0000 (08:26 +0200)]
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>
8 years agoMerge "Add OVS with NSH/DPDK build"
Guo Ruijing [Fri, 17 Jun 2016 00:27:30 +0000 (00:27 +0000)]
Merge "Add OVS with NSH/DPDK build"

8 years agovirtual_fuel: add XML tree as attribute of VirtualFuel 67/15667/3
Josep Puigdemont [Fri, 20 May 2016 08:05:11 +0000 (10:05 +0200)]
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>
8 years agoMerge "ipmi_adapter: add delay to stabilize command action"
Jonas Bjurel [Thu, 16 Jun 2016 16:49:09 +0000 (16:49 +0000)]
Merge "ipmi_adapter: add delay to stabilize command action"

8 years agoipmi_adapter: add delay to stabilize command action 57/15757/1
Josep Puigdemont [Thu, 16 Jun 2016 14:30:31 +0000 (16:30 +0200)]
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>
8 years agoMerge "Mask ipmitool credentials"
Jonas Bjurel [Thu, 16 Jun 2016 13:52:33 +0000 (13:52 +0000)]
Merge "Mask ipmitool credentials"

8 years agoMerge "Mask impitool credentials"
Jonas Bjurel [Thu, 16 Jun 2016 13:52:09 +0000 (13:52 +0000)]
Merge "Mask impitool credentials"

8 years agoMerge "Add command line argument masking for exec_cmd"
Jonas Bjurel [Thu, 16 Jun 2016 13:51:55 +0000 (13:51 +0000)]
Merge "Add command line argument masking for exec_cmd"

8 years agoMerge "Remove unused function: usage()"
Jonas Bjurel [Thu, 16 Jun 2016 13:40:35 +0000 (13:40 +0000)]
Merge "Remove unused function: usage()"

8 years agoMask impitool credentials 37/15737/2
Peter Barabas [Thu, 16 Jun 2016 11:44:17 +0000 (13:44 +0200)]
Mask impitool credentials

Change-Id: I0103082672259eaf4b1c2be8ca3a1236fc6137eb
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
8 years agoMask ipmitool credentials 41/15741/2
Peter Barabas [Thu, 16 Jun 2016 11:51:29 +0000 (13:51 +0200)]
Mask ipmitool credentials

Change-Id: I328432e6b30437e8a83065859cd80358d4c3c468
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
8 years agoAdd command line argument masking for exec_cmd 33/15733/2
Peter Barabas [Thu, 16 Jun 2016 11:19:43 +0000 (13:19 +0200)]
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>
8 years agoMerge "Introducing collection of all fuel and stack deployment logs."
Jonas Bjurel [Thu, 16 Jun 2016 10:17:04 +0000 (10:17 +0000)]
Merge "Introducing collection of all fuel and stack deployment logs."

8 years agoMerge "Clarify docker installation instructions"
Jonas Bjurel [Thu, 16 Jun 2016 10:15:04 +0000 (10:15 +0000)]
Merge "Clarify docker installation instructions"

8 years agoIntroducing collection of all fuel and stack deployment logs. 45/13945/15
Jonas Bjurel [Wed, 11 May 2016 11:38:31 +0000 (13:38 +0200)]
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>
8 years agoRemove unused function: usage() 27/15727/1
Peter Barabas [Thu, 16 Jun 2016 10:01:14 +0000 (12:01 +0200)]
Remove unused function: usage()

Change-Id: I648821262a7bfd77e59f4411380020c49306ff5e
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
8 years agoClarify docker installation instructions 49/5449/4
Peter Barabas [Mon, 4 Jan 2016 08:13:33 +0000 (09:13 +0100)]
Clarify docker installation instructions

Change-Id: I8738798eac64c44a66e4fcab9758094e26a5a69f
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
8 years agoAdd missing package dependency: libyaml-dev 67/5667/3
Peter Barabas [Wed, 6 Jan 2016 12:08:06 +0000 (13:08 +0100)]
Add missing package dependency: libyaml-dev

Change-Id: I058f6bc54e1c6b0a0c20eeaa2ea09f2f9a2e80ce
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
8 years agoAdd OVS with NSH/DPDK build 75/15675/1
Guo Ruijing [Wed, 15 Jun 2016 18:27:14 +0000 (02:27 +0800)]
Add OVS with NSH/DPDK build

Change-Id: I6cdcc56024a4d9fe305783f45856f388e62c0ba8
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
8 years agoMerge "virtual_fuel: initial support for remote libvirt"
Jonas Bjurel [Wed, 15 Jun 2016 17:19:54 +0000 (17:19 +0000)]
Merge "virtual_fuel: initial support for remote libvirt"

8 years agoMerge changes from topic 'remote-libvirt-support'
Jonas Bjurel [Wed, 15 Jun 2016 17:19:37 +0000 (17:19 +0000)]
Merge changes from topic 'remote-libvirt-support'

* changes:
  virtual_fuel: make vm_template an attribute
  virtual_fuel: factor out image creation into a method
  VirtualFuel: Add temp_dir and vm_name attributes

8 years agoMerge changes from topic 'simplify-ipmi-adapter'
Jonas Bjurel [Wed, 15 Jun 2016 17:19:03 +0000 (17:19 +0000)]
Merge changes from topic 'simplify-ipmi-adapter'

* changes:
  ipmi_adapter: simplify, retry if command fails
  common.py: allow specifying number of attempts in exec_cmd

8 years agovirtual_fuel: initial support for remote libvirt 13/14713/3
Josep Puigdemont [Wed, 4 May 2016 12:27:23 +0000 (14:27 +0200)]
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>
8 years agovirtual_fuel: make vm_template an attribute 09/15009/2
Josep Puigdemont [Wed, 4 May 2016 12:27:23 +0000 (14:27 +0200)]
virtual_fuel: make vm_template an attribute

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
8 years agovirtual_fuel: factor out image creation into a method 07/15007/2
Josep Puigdemont [Wed, 4 May 2016 12:27:23 +0000 (14:27 +0200)]
virtual_fuel: factor out image creation into a method

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
8 years agoVirtualFuel: Add temp_dir and vm_name attributes 05/15005/2
Josep Puigdemont [Wed, 4 May 2016 12:27:23 +0000 (14:27 +0200)]
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>