Guo Ruijing [Thu, 23 Jun 2016 04:43:14 +0000 (04:43 +0000)]
Updated armband
Project: fuel
f2656175b7aff1aa7ef5b32e6dfdf1858b612102
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)]
Updated armband
Project: fuel
c1d3d423c43b0e52970749e450b03151704506ac
Add fuel yardstick plugin
Change-Id: Ie6a980ad23e43f6eef775c74d005358d4ab859cc
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Alexandru Avadanii [Wed, 22 Jun 2016 13:17:28 +0000 (15:17 +0200)]
Fix: nova patching: broken puppet chain.
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>
Alexandru Avadanii [Mon, 20 Jun 2016 17:31:30 +0000 (17:31 +0000)]
Merge "Makefile: Fix and update docker-clean."
wu.zhihui [Mon, 20 Jun 2016 11:59:40 +0000 (19:59 +0800)]
Updated armband
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>
Alexandru Avadanii [Sun, 19 Jun 2016 17:42:00 +0000 (17:42 +0000)]
Merge "Fix: upload_cirros hash mixup."
Alexandru Avadanii [Sun, 19 Jun 2016 17:41:33 +0000 (17:41 +0000)]
Merge "f-m: Remove qemu-user-static."
Alexandru Avadanii [Sat, 18 Jun 2016 16:16:03 +0000 (18:16 +0200)]
Makefile: Fix and update docker-clean.
Change-Id: I468f4e37057e812c85034b16748a8083d0c96ab4
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Sat, 18 Jun 2016 02:03:41 +0000 (04:03 +0200)]
Fix: upload_cirros hash mixup.
Change-Id: Ibd41229ce744256fc289756708d64c3fedede9f4
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Sat, 18 Jun 2016 13:11:29 +0000 (13:11 +0000)]
Merge "Fix: reap.py: puppet-managed ifcfg files."
Alexandru Avadanii [Fri, 17 Jun 2016 21:31:30 +0000 (23:31 +0200)]
f-m: Remove qemu-user-static.
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>
Alexandru Avadanii [Fri, 17 Jun 2016 18:22:05 +0000 (18:22 +0000)]
Merge "Fix: f-l: upload_cirros glance cmd, syntar err."
Alexandru Avadanii [Fri, 17 Jun 2016 17:58:13 +0000 (19:58 +0200)]
Fix: reap.py: puppet-managed ifcfg files.
Skip parsing comment lines in ifcfg-ethX files at reap, e.g.:
Change-Id: Ide6b2111619f7558f1434fda5cd254b842cef0ae
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Fri, 17 Jun 2016 17:36:51 +0000 (19:36 +0200)]
Fix: f-l: upload_cirros glance cmd, syntar err.
While at it split another patch in f-l in two.
Change-Id: Ife31a94447176798c3cf7052408ffeddb1e753ff
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
wuwb1989 [Fri, 17 Jun 2016 06:53:49 +0000 (14:53 +0800)]
Updated armband
Project: fuel
4de621898db6e81ca1d0faf3ebd6f41a953be29a
add onos nofeature scenarion map
Change-Id: I5c7d9b712c66860bfbe923396e12641c17d439b5
Signed-off-by: wuwb1989 <wuwenbin2@huawei.com>
Josep Puigdemont [Fri, 17 Jun 2016 15:28:59 +0000 (17:28 +0200)]
opnv-fuel: updated deploy patch set
Change-Id: I9442f217d2f840382b40f6eae77ddb9ae2ddbadc
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
Josep Puigdemont [Fri, 17 Jun 2016 06:26:53 +0000 (08:26 +0200)]
Updated armband
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>
Guo Ruijing [Fri, 17 Jun 2016 00:27:30 +0000 (00:27 +0000)]
Updated armband
Project: fuel
109b0e70eb9963fd5d4aa8e7fda3cc30ec7752b9
Add OVS with NSH/DPDK build
Change-Id: I6cdcc56024a4d9fe305783f45856f388e62c0ba8
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Josep Puigdemont [Fri, 20 May 2016 08:05:11 +0000 (10:05 +0200)]
Updated armband
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>
Jonas Bjurel [Thu, 16 Jun 2016 16:49:09 +0000 (16:49 +0000)]
Updated armband
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>
Jonas Bjurel [Thu, 16 Jun 2016 13:52:33 +0000 (13:52 +0000)]
Updated armband
Project: fuel
523ae3b3247412daff4c127f505fc64d6dc67696
Mask ipmitool credentials
Change-Id: I328432e6b30437e8a83065859cd80358d4c3c468
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
Jonas Bjurel [Thu, 16 Jun 2016 13:52:09 +0000 (13:52 +0000)]
Updated armband
Project: fuel
7994abe6083f408823149669fa2e51ef7d341a8e
Mask impitool credentials
Change-Id: I0103082672259eaf4b1c2be8ca3a1236fc6137eb
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
Jonas Bjurel [Thu, 16 Jun 2016 13:51:55 +0000 (13:51 +0000)]
Updated armband
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>
Jonas Bjurel [Thu, 16 Jun 2016 13:40:35 +0000 (13:40 +0000)]
Updated armband
Project: fuel
aace3a2620c1c49932c7c82ed6cc154c78d19bef
Remove unused function: usage()
Change-Id: I648821262a7bfd77e59f4411380020c49306ff5e
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
Jonas Bjurel [Thu, 16 Jun 2016 10:17:04 +0000 (10:17 +0000)]
Updated armband
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>
Jonas Bjurel [Thu, 16 Jun 2016 10:15:04 +0000 (10:15 +0000)]
Updated armband
Project: fuel
58b6866358c503f6ac588629b705867863523e69
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)]
Updated armband
Project: fuel
7361290e6eef010ee646d98f90b3c3fa00ee2b38
Add missing package dependency: libyaml-dev
Change-Id: I058f6bc54e1c6b0a0c20eeaa2ea09f2f9a2e80ce
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
Alexandru Avadanii [Wed, 15 Jun 2016 20:13:57 +0000 (20:13 +0000)]
Merge "Rebase: f-l: vga nova patch after upstream change."
Alexandru Avadanii [Wed, 15 Jun 2016 18:49:18 +0000 (20:49 +0200)]
Rebase: f-l: vga nova patch after upstream change.
Change-Id: I4f029b00b03c665bef2bbf367953e9d95ed215f1
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Wed, 15 Jun 2016 17:59:14 +0000 (19:59 +0200)]
Upstream: remote-libvirt + custom tags.
Change-Id: I3702648583983ac7afcfef7a9556fcd33e984457
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Jonas Bjurel [Wed, 15 Jun 2016 17:19:54 +0000 (17:19 +0000)]
Updated armband
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>
Jonas Bjurel [Wed, 15 Jun 2016 17:19:37 +0000 (17:19 +0000)]
Updated armband
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>
Jonas Bjurel [Wed, 15 Jun 2016 17:19:03 +0000 (17:19 +0000)]
Updated armband
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>
Alexandru Avadanii [Tue, 31 May 2016 20:08:25 +0000 (22:08 +0200)]
Updated armband
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>
Alexandru Avadanii [Wed, 15 Jun 2016 14:54:39 +0000 (14:54 +0000)]
Merge "Fix: f-l: usb_table borked rebase."
Alexandru Avadanii [Wed, 15 Jun 2016 14:54:28 +0000 (14:54 +0000)]
Merge "Upstream: IPMI port + Mitaka mirror."
Jonas Bjurel [Wed, 15 Jun 2016 12:31:22 +0000 (12:31 +0000)]
Updated armband
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>
Alexandru Avadanii [Sun, 21 Feb 2016 15:28:02 +0000 (16:28 +0100)]
Updated armband
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>
Alexandru Avadanii [Wed, 15 Jun 2016 09:31:54 +0000 (11:31 +0200)]
Fix: f-l: usb_table borked rebase.
I messed up the identation and missed a semicolon during rebase.
Change-Id: I7142721cc57115a72c93bcfd270c03d6cb04c399
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Wed, 15 Jun 2016 09:08:27 +0000 (11:08 +0200)]
Upstream: IPMI port + Mitaka mirror.
Change-Id: I3c7bd7f9be85078783a2e95dfe480cffc08534d1
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Michal Skalski [Wed, 15 Jun 2016 08:33:34 +0000 (08:33 +0000)]
Updated armband
Project: fuel
301ce6a92c82f65df08d75995d35316005e38ff9
Build local mirrors for stable/mitaka
Change-Id: I3128652aeb87cb2cfaa91ded1b8d9ebeeb70d33b
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
Alexandru Avadanii [Mon, 23 May 2016 20:06:09 +0000 (22:06 +0200)]
Updated armband
Project: fuel
a2ee8e7efc66be53645c8b1d7c43b7740bc999cd
deploy: ipmi adapter: Add <port> config support.
Sometimes the IPMI lanplus protocol listens on a non-standard
remote port, e.g. when target nodes are interfaced through a
fake IPMI BMC application that listens on multiple ports on the
same IP address.
Therefore, allow setting IPMI port in the DHA using a new
property named `ipmiPort`, and pass it along to `ipmitool` when set.
CHANGE: get_access_info now also supports specifying the IPMI
port to use with `ipmitool` by configuring the `ipmiPort`
property in the DHA.
hp_adapter.py: updated `get_access_info` return signature with
the new (unused there) `ipmiport`.
Change-Id: I620176bd7f466aa460518cf12d15ccbe86a22560
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
wuwb1989 [Wed, 8 Jun 2016 03:42:31 +0000 (11:42 +0800)]
Updated armband
Project: fuel
8b192597ef66f45a820886bfe2489548a9fa807f
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)]
Updated armband
Project: fuel
53ddd94cc6a61c4121300b529209662755f36b5a
Enable vsperf plugin in fuel 9.0
Change-Id: I96b59e22fcc0269aa3ae0b04587c8ca7d0fab867
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Jonas Bjurel [Tue, 14 Jun 2016 18:24:15 +0000 (18:24 +0000)]
Updated armband
Project: fuel
eb299372fbb32f93cac6c92060e37bd21c7d8ba0
Update configuration for fuel 9 virtual deployment in Huawei-China.
Change-Id: I9d2fc979886510c165af8dbac93ddcdc954727cf
Signed-off-by: wuwenbin2 <wuwenbin2@huawei.com>
Stefan K. Berg [Tue, 14 Jun 2016 13:52:16 +0000 (15:52 +0200)]
Updated armband
Project: fuel
dac2b89d574c21951a82e9408e58e5b92ac33763
Fixing erroneous hypervisor type
A "qemu" snuck in instead of "kvm".
Change-Id: Ibe704103cd1bab6e127a31d08d53f53518033539
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Alexandru Avadanii [Tue, 14 Jun 2016 12:36:34 +0000 (12:36 +0000)]
Merge "Rebase for "Improve reliability of upload_cirros""
Alexandru Avadanii [Tue, 14 Jun 2016 12:35:52 +0000 (12:35 +0000)]
Merge "Makefile: git submodules should track remotes."
Stefan K. Berg [Mon, 13 Jun 2016 16:29:13 +0000 (18:29 +0200)]
Updated armband
Project: fuel
406636f26873d551c1adcf10275d0064c22d2b40
Updated devel-pipeline DEA overrides for Fuel 9.0
Minor fix in the ELX version.
Update to Fuel 9.0 in the default version.
Change-Id: Ic084b86e7f6d2dfc3d15b10f0ef72e04ef2b7bf6
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Alexandru Avadanii [Mon, 13 Jun 2016 19:04:24 +0000 (21:04 +0200)]
Rebase for "Improve reliability of upload_cirros"
Upstream change "Improve reliability of upload_cirros.rb" [1]
allows us to drop the "Increase upload_cirros timeout" patch,
and also requires rebasing our direct kernel boot patch.
Also squashed in a small context edit for an unrelated patch.
[1] https://review.openstack.org/#/c/327792/
Change-Id: I8adc30a74714414fae55bc7b81bc0f69f41735ce
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Mon, 13 Jun 2016 16:29:45 +0000 (18:29 +0200)]
Makefile: git submodules should track remotes.
Instead of binding git submodules to a specific commit, track
their remote origins at `make submodules-init`.
This introduces the risk of upstream changes breaking our patches
more frequently (used to be whenever we bumped submodules by hand),
and requiring rebasing, but that already happens for Fuel@OPNFV.
This represents a major improvement in tracking upstream and moving
away from forking, at the expense of more frequent rebasing, until
we upstream or move to post-installation step all our patches.
For example, since we rebased our modules 1-2 weeks ago, quite
a few patches landed upstream (e.g. [1]) that we missed in our builds.
[1] https://bugs.launchpad.net/fuel/+bug/
1587773
Change-Id: I2d9e0877513558c86f68875f03976002f757e5ee
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Stefan K. Berg [Mon, 13 Jun 2016 14:55:10 +0000 (14:55 +0000)]
Updated armband
Project: fuel
eb94725aae686ac519070f00ee9628ae0725d00f
Modification of deployment config for Fuel 9 and ELX lab
Change-Id: I380087889cda079a56c8cea3acc13145dcd49046
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Stefan Berg [Mon, 13 Jun 2016 12:38:14 +0000 (12:38 +0000)]
Updated armband
Project: fuel
c6da8551bcdc1762a3135fcaabee7e5f98e6fcb9
Revert "Temporary fix for PXE booting from the wrong NIC"
This reverts commit
5926bcddca0eca28a33ae43aadf90b9263ae6b84.
Change-Id: Ibea4ca5d38ce2e10ab6d5bb1d7ccdf666ee149d5
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Daniel Smith [Mon, 13 Jun 2016 11:45:58 +0000 (11:45 +0000)]
Updated armband
Project: fuel
b598e13d935c29e5bbc3d2be3a2731b2b63d3ec5
Temporary fix for PXE booting from the wrong NIC
Change-Id: I1f6d38da24d5a4e66061b9bdfe576fbbda7fb624
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
Alexandru Avadanii [Mon, 13 Jun 2016 11:10:27 +0000 (11:10 +0000)]
Merge "Rework: Move m1.micro RAM bump to post-install."
Alexandru Avadanii [Mon, 13 Jun 2016 11:10:21 +0000 (11:10 +0000)]
Merge "Rework: Move nailgun timeout patch to postinstall"
Alexandru Avadanii [Mon, 13 Jun 2016 11:10:09 +0000 (11:10 +0000)]
Merge "Cleanup: Drop obsoleted hardcode, now in fixture."
Alexandru Avadanii [Mon, 13 Jun 2016 11:09:56 +0000 (11:09 +0000)]
Merge "Fix: f-w: Nailgun `current_release` obsoleted."
Alexandru Avadanii [Sat, 11 Jun 2016 21:37:40 +0000 (23:37 +0200)]
Rework: Move m1.micro RAM bump to post-install.
Change-Id: I158c58cb01112d2113a75dd425275cf9531d49fc
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Sat, 11 Jun 2016 19:43:54 +0000 (21:43 +0200)]
Rework: Move nailgun timeout patch to postinstall
Change-Id: I927bb36b0ac4628630f90649027441a895c6f774
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Fri, 10 Jun 2016 20:33:00 +0000 (22:33 +0200)]
Rework: Move xz/gzip switch to post-install.
This is highly unlikely to be upstreamed in any other form than this.
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Fri, 10 Jun 2016 18:41:27 +0000 (20:41 +0200)]
Fix: f-w: Nailgun `current_release` obsoleted.
Upstream fuel-web change "Remove legacy patching code" [1]
obsoletes `current_release` definition in `deployment_serializers.py`.
Update our nailgun patch that adds arch field to no longer rely on
this functionality.
[1] https://review.openstack.org/#/c/280708/
Change-Id: I93b3691be860427da320c5c0a2c799dcc4158afd
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Thu, 9 Jun 2016 19:44:07 +0000 (21:44 +0200)]
Rework: Move fuel-astute patch to post-install.
IMPORTANT:
Drop `fuel-astute` submodule, and patch it instead during the Fuel
Master node bootstrapping process, using an OPNFV post.d script.
Luckily, this fits well with the recently added script that prepares
FM for cross-building.
One step closer to un-forking.
Change-Id: Ia612e0ad4077b16baf54f1b9ebf9d207daca0be4
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Fri, 10 Jun 2016 20:43:47 +0000 (22:43 +0200)]
Cleanup: Drop obsoleted hardcode, now in fixture.
We used to change the harcoded grub-pc with grub-efi-arm64, but
since Mitaka now adds package list overrides in fixtures [1], we
may remove this obsolete patch.
[1] https://github.com/openstack/fuel-web/commit/
4ee42effe27694bd231663e3d0f10c0c42877177
Change-Id: I6707b4dbf3823f356c7ff2367215a41e287b80ac
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Thu, 9 Jun 2016 18:36:38 +0000 (20:36 +0200)]
post-scripts: Enable systemd-binfmt for first boot.
ARMBAND NOTE(S):
- This is a bug fix + a new feature (arch list in a file on FM)
- This is overengineered because:
* we want to move patching to post-ISO creation, OPNFV style;
* easier integration with Fuel@OPNFV, using post-install scripts;
* prepare for true multiarch support on Fuel Master;
IMPORTANT:
This commit introduces the following file on Fuel Master,
containing the list of arch supported for target nodes:
</etc/fuel_openstack_arch>.
This file is created AFTER pre.d OPNFV scripts are ran, also by
bootstrap_admin_node.sh, BEFORE the post.d scripts are executed.
NOTE: Arch format is the same used by dpkg (e.g.: "amd64 arm64")
Based on the number of foreign architectures we should support
(the list of archs in /etc/fuel_openstack_arch minus native arch),
we determine whether cross-builds are expected, in which case
binfmt support should be functional during first Fuel Master boot.
Since systemd-binfmt service has a series of preconditions for
starting, which are tested early during first boot, some of them
are NOT YET true (e.g. no binfmt handlers are present before
qemu-user-static package is installed), so the service is not
automatically started. Of course, this only affects the first boot.
Finally, this commit adds an OPNFV post-install script in
/opt/opnfv/bootstrap/post.d, which starts systemd-binfmt service.
Change-Id: I6dbe4b3ac5a2fd076881d6778ff66b82bb6c7379
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Wed, 8 Jun 2016 16:47:05 +0000 (18:47 +0200)]
FIXME: Temporary: Backport: build local mirrors.
Backport upstream pending patch
"Build local mirrors for stable/mitaka" from [1].
Minor rebase for two other patches after applying this series.
[1] https://gerrit.opnfv.org/gerrit/#/c/15259
Change-Id: I362e08be3460d711de064a487fdcc8c76fc69af9
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Wed, 8 Jun 2016 15:41:20 +0000 (17:41 +0200)]
Rebase: p/f/deploy-reap-extra-eth: context update.
Update patch `deploy/reap.py: Dump extra interfaces information.`
after upstream change was merged [1].
[1] https://gerrit.opnfv.org/gerrit/#/c/15275/
Change-Id: I9fd74775030732cc0759610228fa80a0cec72352
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Wed, 8 Jun 2016 15:32:15 +0000 (17:32 +0200)]
Rebase: rm p/f/Allow-customizing-fuel-plugin-odl.
Upstream change [1] made this patch obsolete.
While at it, update related patch context after same change.
[1] https://gerrit.opnfv.org/gerrit/#/c/14385/
Change-Id: I21753e4dafdd0ab83c5eac37f394aa704bbe236b
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Wed, 8 Jun 2016 15:26:12 +0000 (17:26 +0200)]
Fix: f-l: s/nailgun::/fuel::/cobbler::preseed.
The nailgun puppet module has been replaced with fuel puppet module.
This change needs to be reflected in our cobbler preseed function,
which I missed during the initial rebase.
[1] https://github.com/openstack/fuel-library/commit/
74a68f493ff215ce8dfc67c3af6d06dd5a2db194
Change-Id: Ie13861ff75fc289ab03190f48fcfb5579499db1e
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Tue, 31 May 2016 21:00:56 +0000 (23:00 +0200)]
FIXME: Temporary: Remove repo-mirror-cz.patch.
Upstream removed all mirrors but usa and cz, and changed
its default to mirror.fuel-infra.org in [1].
This allows us to drop patching of fuel-main/config.mk
with the Czech mirror.
If needed, USE_MIRROR=cz can be specified as an env var.
FIXME: Remove when Fuel@OPNFV pulls change and deals with it.
[1] https://github.com/openstack/fuel-main/commit/
751d502cfe15d9c9df0ee89530ac3b0b73aa1638
Alexandru Avadanii [Wed, 8 Jun 2016 14:50:35 +0000 (14:50 +0000)]
Merge "Fuel deploy: timestamp for newly created images"
Alexandru Avadanii [Wed, 8 Jun 2016 14:36:36 +0000 (14:36 +0000)]
Merge "Rebase: deploy related patch series."
Stefan Berg [Wed, 8 Jun 2016 14:26:15 +0000 (14:26 +0000)]
Updated armband
Project: fuel
14f07bc7ecb9f166d5244abcc5789d8fd584c0dd
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>
Michal Skalski [Wed, 8 Jun 2016 14:24:53 +0000 (14:24 +0000)]
Updated armband
Project: fuel
6f9e8e2c829412d350644fa6a820a8a2890f69b7
Do not create files when check connectivity
Change-Id: If0ab25ee843f9892510da3d3c8d1f10a54440545
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
Stefan K. Berg [Wed, 8 Jun 2016 14:23:18 +0000 (14:23 +0000)]
Updated armband
Project: fuel
a87426e28f604517de39f778b7a216ecf75e172a
Script to clean expired build cache items
Change-Id: I5e466c89c05eb4d637778218cfe03b88d569f331
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Peter Barabas [Wed, 8 Jun 2016 13:10:31 +0000 (15:10 +0200)]
Updated armband
Project: fuel
7b6a386fe58d96ff476cd8c34a18c6e7bce8895f
Fix for not reaping 'ssh_network'
Change-Id: Ib225701a808211e50554c8f1762325aa75ecc33f
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
Michal Skalski [Mon, 6 Jun 2016 09:52:09 +0000 (09:52 +0000)]
Updated armband
Project: fuel
c4afb1da513ef3230432fff400ea231660b230c9
Build odl plugin for mitaka
Change-Id: I59b96a424a753f880b4ac16abd806851ad3f9533
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
Alexandru Avadanii [Thu, 2 Jun 2016 22:04:39 +0000 (00:04 +0200)]
Fix: nailgun_syncdb upgrade to Fuel 9.0.1.
Armband database migrations were applied on top of Fuel 8.0,
creating two heads:
43b2cb64dae6 (branchpoint)
->
11a9adc6d36a
->
f9b7fd91ac19 (head)
Update our change to be applied on top of Fuel 9.0.1.
Change-Id: If5b2ff1aa082227cebd268a2515b78a350166598
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Tue, 31 May 2016 18:45:51 +0000 (20:45 +0200)]
Makefile: Mitaka update.
Remove unnecesary overrides from Makefile.
Switch Armband repo from 8.0 to 9.0, trimming "-fuel" repo URL suffix.
ODL plugin build remains enabled.
All other plugins are currently not built.
Some cleanup is due in the future:
FIXME: Switch to our own JDK later.
FIXME: Remove FUEL_CENTOS_8.0 stuff.
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Wed, 1 Jun 2016 20:47:21 +0000 (22:47 +0200)]
Rebase: ODL Fuel plugin arm64 support patch.
ODL plugin package is now arch-independent, drop arm64 hardcode.
FIXME: Some arm64 hardcodes remain in place, like installing
quagga package.
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Wed, 1 Jun 2016 12:52:29 +0000 (14:52 +0200)]
Fixture: fix wrong identation (missing space)
This prevented YAML parsers from reading the Mitaka fixtures
configuration file.
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Tue, 31 May 2016 20:39:45 +0000 (22:39 +0200)]
Rebase: p/f-l: Update VGA defaults patch context.
Minor change upstream requires us to rebase this patch.
Alexandru Avadanii [Tue, 31 May 2016 20:34:54 +0000 (22:34 +0200)]
Rebase: deploy related patch series.
After change "common.py: catch stderr in exec_cmd" [1] and other
unrelated changes were merged upstream,
we need to rebase the complete deploy related series.
While we're at it, re-export Fuel@OPNFV patches in Armband.
[1] https://gerrit.opnfv.org/gerrit/#/c/14561/
Change-Id: Icbc8261c2e24e4b29e8f5f2bc83db6829219129a
Josep Puigdemont [Tue, 17 May 2016 13:06:44 +0000 (15:06 +0200)]
Fuel deploy: timestamp for newly created images
All images created are named opnfv.iso, this is not sustainable in an
environment where several PODs might share the same libvirt storage
pool. For this we need unique names, and the time stamp is a cheap way
for now to achieve this.
Change-Id: I8a7d34036898b8b4e57b23c11bee643876e1829c
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
Alexandru Avadanii [Fri, 3 Jun 2016 12:08:57 +0000 (12:08 +0000)]
Merge "Upstream: p/common.py: catch stderr in exec_cmd."
Alexandru Avadanii [Fri, 3 Jun 2016 12:08:48 +0000 (12:08 +0000)]
Merge "Upstream: ODL file limit patch was merged upstream"
Alexandru Avadanii [Fri, 3 Jun 2016 12:08:37 +0000 (12:08 +0000)]
Merge "p/Separate-armband-repo no longer needed."
Alexandru Avadanii [Fri, 3 Jun 2016 12:08:08 +0000 (12:08 +0000)]
Merge "Submodule(s) rebase on stable/mitaka."
Alexandru Avadanii [Thu, 2 Jun 2016 18:21:32 +0000 (18:21 +0000)]
Merge "Rebase: Sync after Build system uplift to Fuel 9.0"
Peter Barabas [Thu, 2 Jun 2016 08:29:29 +0000 (10:29 +0200)]
Updated armband
Project: fuel
6c498c04a9843bcc99dc94650e5d0b31490dfa1b
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)]
Updated armband
Project: fuel
2498bbb0354fd7abbbb408810f419c2999c23a31
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>
Jonas Bjurel [Wed, 1 Jun 2016 18:23:33 +0000 (18:23 +0000)]
Updated armband
Project: fuel
0ac1af6354f57c389b407cb1ea1e0365027704a6
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>
Alexandru Avadanii [Tue, 31 May 2016 19:35:02 +0000 (21:35 +0200)]
Upstream: p/common.py: catch stderr in exec_cmd.
See Fuel@OPNFV change [1].
[1] https://gerrit.opnfv.org/gerrit/#/c/14561/
Alexandru Avadanii [Tue, 31 May 2016 20:45:50 +0000 (22:45 +0200)]
Upstream: ODL file limit patch was merged upstream
See upstream commit [1].
[1] https://github.com/openstack/fuel-plugin-opendaylight/
commit/
5012455d58ddfda5894130ca14d8fb7d6b4c8b60
Alexandru Avadanii [Tue, 31 May 2016 18:21:22 +0000 (20:21 +0200)]
p/Separate-armband-repo no longer needed.
Since Fuel@OPNFV switched from carrying the orig ks.cfg to a patch
for this file in "Build system uplift to Fuel 9.0/Mitaka" [1],
we (Armband) can now drop this patch.
[1] https://gerrit.opnfv.org/gerrit/#/c/13919/
Alexandru Avadanii [Tue, 31 May 2016 20:27:22 +0000 (22:27 +0200)]
Submodule(s) rebase on stable/mitaka.
Peter Barabas [Wed, 1 Jun 2016 08:31:54 +0000 (10:31 +0200)]
Updated armband
Project: fuel
74454885828f33629f0355616017b67768bc7bd8
Clean up after ourselves
Change-Id: Id7579ef618b8cd922de325d9dc1c0b7a6c5587a7
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
Daiel Smith [Wed, 1 Jun 2016 03:49:46 +0000 (23:49 -0400)]
Updated armband
Project: fuel
1378a27086272efec083778dd52fb27511b88167
A small edit for the uplift to Mitaka from Liberty
Signed-off-by: Daiel Smith <daniel.smith@ericsson.com>
JIRA:0
Josep Puigdemont [Wed, 4 May 2016 12:27:23 +0000 (14:27 +0200)]
Updated armband
Project: fuel
3b8db706acb60b680bcf220bd0236d5efcc66d07
common.py: catch stderr in exec_cmd
When running commands with exec_cmd(), the stderr of the command is
sent to /dev/null and ignored, and only stdout is retrieved. Thus, when
a command fails and check is enabled, only the output of stdout is
presented to the user, which normally holds no information about the
error.
In this patch we retrieve stderr, and when an error occurs, an exception
is raised with that message.
Fixes https://jira.opnfv.org/browse/FUEL-142
Change-Id: I3940e1a43963a6abec362481b1d4ce7bd7cb816d
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
Alexandru Avadanii [Tue, 31 May 2016 18:18:25 +0000 (20:18 +0200)]
Rebase: Sync after Build system uplift to Fuel 9.0
Refresh patches after Fuel@OPNFV migrated to Mitaka in [1],
"Build system uplift to Fuel 9.0/Mitaka".
>As bootstrap_admin_node.sh has
>been transitioned into an RPM (fuel-support), the lazy designer found
>it more simple to patch that script during the Fuel build phase than
>at the OPNFV ISO generation. The patch mechanism has been changed to
>a normal context diff instead of the orig/modified file tuples
>previously used. Hopefully this will require fewer manual rebases
>(may the fuzz be with us!).
>Also the ks.cfg patching has transitioned to a context based ordinary
>patch for the same reasons, but this is as before taking place during
>OPNFV ISO generation.
[1] https://gerrit.opnfv.org/gerrit/#/c/13919/