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>
Michal Skalski [Fri, 8 Jul 2016 16:29:17 +0000 (16:29 +0000)]
Merge "[BGPVPN] Do not include temporary files in plugin"
Michal Skalski [Fri, 8 Jul 2016 16:16:33 +0000 (16:16 +0000)]
Merge "deploy: ISO rebuild: use -joliet-long names."
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
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Michal Skalski [Thu, 30 Jun 2016 21:55:56 +0000 (21:55 +0000)]
Merge "Use ODL Boron for SFC"
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>
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>
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>
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>
Guo Ruijing [Thu, 30 Jun 2016 00:42:35 +0000 (00:42 +0000)]
Merge "Fix NSH patches"
Michal Skalski [Wed, 29 Jun 2016 09:28:20 +0000 (09:28 +0000)]
Merge "Use openjdk-8-jre by default"
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>
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>
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>
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>
Jonas Bjurel [Tue, 28 Jun 2016 11:44:23 +0000 (11:44 +0000)]
Merge "Add timeout for SCP operations"
Guo Ruijing [Tue, 28 Jun 2016 00:42:50 +0000 (00:42 +0000)]
Merge "Add fuel@opnfv build based on vagrant"
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>
Guo Ruijing [Thu, 23 Jun 2016 04:43:14 +0000 (04:43 +0000)]
Merge "Fix wget failure in fue@opnfv"
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>
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>
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>
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>
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>
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>
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>
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>
Guo Ruijing [Fri, 17 Jun 2016 00:27:30 +0000 (00:27 +0000)]
Merge "Add OVS with NSH/DPDK build"
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>
Jonas Bjurel [Thu, 16 Jun 2016 16:49:09 +0000 (16:49 +0000)]
Merge "ipmi_adapter: add delay to stabilize command action"
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>
Jonas Bjurel [Thu, 16 Jun 2016 13:52:33 +0000 (13:52 +0000)]
Merge "Mask ipmitool credentials"
Jonas Bjurel [Thu, 16 Jun 2016 13:52:09 +0000 (13:52 +0000)]
Merge "Mask impitool credentials"
Jonas Bjurel [Thu, 16 Jun 2016 13:51:55 +0000 (13:51 +0000)]
Merge "Add command line argument masking for exec_cmd"
Jonas Bjurel [Thu, 16 Jun 2016 13:40:35 +0000 (13:40 +0000)]
Merge "Remove unused function: usage()"
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>
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>
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>
Jonas Bjurel [Thu, 16 Jun 2016 10:17:04 +0000 (10:17 +0000)]
Merge "Introducing collection of all fuel and stack deployment logs."
Jonas Bjurel [Thu, 16 Jun 2016 10:15:04 +0000 (10:15 +0000)]
Merge "Clarify docker installation instructions"
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>
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>
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>
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>
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>
Jonas Bjurel [Wed, 15 Jun 2016 17:19:54 +0000 (17:19 +0000)]
Merge "virtual_fuel: initial support for remote libvirt"
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
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
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>
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>
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>
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>
Josep Puigdemont [Fri, 6 May 2016 10:09:58 +0000 (12:09 +0200)]
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>
Alexandru Avadanii [Tue, 31 May 2016 20:08:25 +0000 (22:08 +0200)]
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>
Josep Puigdemont [Fri, 6 May 2016 01:28:26 +0000 (03:28 +0200)]
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>
Jonas Bjurel [Wed, 15 Jun 2016 12:31:22 +0000 (12:31 +0000)]
Merge "repobuild: Allow customizing fuel-mirror repo URL"
Alexandru Avadanii [Wed, 24 Feb 2016 19:02:25 +0000 (20:02 +0100)]
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>
Alexandru Avadanii [Sun, 21 Feb 2016 15:28:02 +0000 (16:28 +0100)]
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>
Michal Skalski [Wed, 15 Jun 2016 08:33:34 +0000 (08:33 +0000)]
Merge "Build local mirrors for stable/mitaka"
Alexandru Avadanii [Mon, 23 May 2016 20:06:09 +0000 (22:06 +0200)]
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>
wuwb1989 [Wed, 8 Jun 2016 03:42:31 +0000 (11:42 +0800)]
build and deploy onos plugin for fuel9
Change-Id: I04dd8b4bdddc5678b158d7287c6ffc52d1bce135
Signed-off-by: wuwb1989 <wuwenbin2@huawei.com>
Jonas Bjurel [Tue, 14 Jun 2016 18:27:33 +0000 (18:27 +0000)]
Merge "Enable vsperf plugin in fuel 9.0"
Jonas Bjurel [Tue, 14 Jun 2016 18:24:15 +0000 (18:24 +0000)]
Merge "Update configuration for fuel 9 virtual deployment in Huawei-China."
Guo Ruijing [Sat, 11 Jun 2016 16:29:53 +0000 (00:29 +0800)]
Enable vsperf plugin in fuel 9.0
Change-Id: I96b59e22fcc0269aa3ae0b04587c8ca7d0fab867
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Stefan K. Berg [Tue, 14 Jun 2016 13:52:16 +0000 (15:52 +0200)]
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>
Michal Skalski [Tue, 7 Jun 2016 22:54:57 +0000 (00:54 +0200)]
Build local mirrors for stable/mitaka
Change-Id: I3128652aeb87cb2cfaa91ded1b8d9ebeeb70d33b
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
wuwenbin2 [Tue, 14 Jun 2016 07:41:08 +0000 (15:41 +0800)]
Update configuration for fuel 9 virtual deployment in Huawei-China.
Change-Id: I9d2fc979886510c165af8dbac93ddcdc954727cf
Signed-off-by: wuwenbin2 <wuwenbin2@huawei.com>
Stefan K. Berg [Mon, 13 Jun 2016 16:29:13 +0000 (18:29 +0200)]
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>
Stefan K. Berg [Mon, 13 Jun 2016 14:55:10 +0000 (14:55 +0000)]
Merge "Modification of deployment config for Fuel 9 and ELX lab"
Stefan Berg [Mon, 13 Jun 2016 12:38:14 +0000 (12:38 +0000)]
Merge "Revert "Temporary fix for PXE booting from the wrong NIC""
Stefan Berg [Mon, 13 Jun 2016 12:32:07 +0000 (12:32 +0000)]
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>
Daniel Smith [Mon, 13 Jun 2016 11:45:58 +0000 (11:45 +0000)]
Merge "Temporary fix for PXE booting from the wrong NIC"
Peter Barabas [Mon, 13 Jun 2016 11:18:04 +0000 (13:18 +0200)]
Temporary fix for PXE booting from the wrong NIC
Change-Id: I1f6d38da24d5a4e66061b9bdfe576fbbda7fb624
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
Stefan K. Berg [Mon, 13 Jun 2016 07:26:57 +0000 (09:26 +0200)]
Modification of deployment config for Fuel 9 and ELX lab
Change-Id: I380087889cda079a56c8cea3acc13145dcd49046
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Stefan Berg [Wed, 8 Jun 2016 14:26:15 +0000 (14:26 +0000)]
Merge "ISO: Use --joliet-long names."
Michal Skalski [Wed, 8 Jun 2016 14:24:53 +0000 (14:24 +0000)]
Merge "Do not create files when check connectivity"
Stefan K. Berg [Wed, 8 Jun 2016 14:23:18 +0000 (14:23 +0000)]
Merge "Script to clean expired build cache items"
Michal Skalski [Wed, 8 Jun 2016 13:18:35 +0000 (15:18 +0200)]
Do not create files when check connectivity
Change-Id: If0ab25ee843f9892510da3d3c8d1f10a54440545
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
Peter Barabas [Wed, 8 Jun 2016 13:10:31 +0000 (15:10 +0200)]
Fix for not reaping 'ssh_network'
Change-Id: Ib225701a808211e50554c8f1762325aa75ecc33f
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
Stefan K. Berg [Wed, 8 Jun 2016 11:50:32 +0000 (13:50 +0200)]
Script to clean expired build cache items
Change-Id: I5e466c89c05eb4d637778218cfe03b88d569f331
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Michal Skalski [Mon, 6 Jun 2016 09:52:09 +0000 (09:52 +0000)]
Merge "Build odl plugin for mitaka"
Michal Skalski [Thu, 19 May 2016 14:52:18 +0000 (16:52 +0200)]
Build odl plugin for mitaka
Change-Id: I59b96a424a753f880b4ac16abd806851ad3f9533
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
Peter Barabas [Thu, 2 Jun 2016 08:29:29 +0000 (10:29 +0200)]
Download deployment config after modification
Modified network or interface configurations were not reflected in
the deployment config, resulting in faulty node configurations.
Change-Id: I4ca20702c0171e7995f2b4f46317557ec9d5beac
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
Stefan K. Berg [Thu, 2 Jun 2016 07:19:28 +0000 (07:19 +0000)]
Merge "Auto deploy corrections for Fuel 9.0"
Jonas Bjurel [Wed, 1 Jun 2016 18:23:33 +0000 (18:23 +0000)]
Merge "docs: Mitaka Build req: Add p7zip-full."
Alexandru Avadanii [Wed, 1 Jun 2016 14:43:17 +0000 (16:43 +0200)]
ISO: 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).
This works around ISO build error(s) like:
"genisoimage: Error:
./ubuntu/pool/main/g/golang-gogoprotobuf/golang-gogoprotobuf\
-dev_0.0~git20150828.0.
6cab0cc-1~u14.04+mos1_amd64.deb and
./ubuntu/pool/main/g/golang-gogoprotobuf/golang-gogoprotobuf\
-dev_0.0~git20150828.0.
6cab0cc-1~u14.04+mos1_arm64.deb
have the same Joliet name"
Change-Id: I89d9816d86176d80bcc76f5f90c8391b0664ab82
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Wed, 1 Jun 2016 13:43:06 +0000 (15:43 +0200)]
docs: Mitaka Build req: Add p7zip-full.
Build system uplift to Fuel 9.0/Mitaka now requires `7z` cmd utility
also on the builder host (not only inside docker containers), so
document this as a prereq in the build instructions.
[1] https://gerrit.opnfv.org/gerrit/#/c/13919/
Change-Id: Icb57ac58c499272fce0a27bb2d25383e933c7814
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Stefan K. Berg [Wed, 1 Jun 2016 11:25:37 +0000 (13:25 +0200)]
Auto deploy corrections for Fuel 9.0
- The auto deployer's detection of nodes being up corrected as "fuel node"
now returns "1" instead of "True" to denote that the node is up.
- The location of bootstrap_admin_node.sh has changed so the detection of
whether the Fuel node installation needed a correction for the deployer
not to throw an exit code and terminate prematurely.
- Small fix: deploy.py is now executable (just a chmod change).
Change-Id: I8fed7bafe6912f8b4278619bbdaa16577a82737b
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Peter Barabas [Wed, 1 Jun 2016 08:31:54 +0000 (10:31 +0200)]
Clean up after ourselves
Change-Id: Id7579ef618b8cd922de325d9dc1c0b7a6c5587a7
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>