armband.git
8 years agoUpstream: IPMI port + Mitaka mirror. 05/15605/1
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>
8 years agoUpdated armband
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>
8 years agoUpdated armband
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>
8 years agoUpdated armband
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>
8 years agoUpdated armband
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>
8 years agoUpdated armband
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>
8 years agoUpdated armband
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>
8 years agoMerge "Rebase for "Improve reliability of upload_cirros""
Alexandru Avadanii [Tue, 14 Jun 2016 12:36:34 +0000 (12:36 +0000)]
Merge "Rebase for "Improve reliability of upload_cirros""

8 years agoMerge "Makefile: git submodules should track remotes."
Alexandru Avadanii [Tue, 14 Jun 2016 12:35:52 +0000 (12:35 +0000)]
Merge "Makefile: git submodules should track remotes."

8 years agoUpdated armband
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>
8 years agoRebase for "Improve reliability of upload_cirros" 81/15481/1
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>
8 years agoMakefile: git submodules should track remotes. 75/15475/1
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>
8 years agoUpdated armband
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>
8 years agoUpdated armband
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>
8 years agoUpdated armband
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>
8 years agoMerge "Rework: Move m1.micro RAM bump to post-install."
Alexandru Avadanii [Mon, 13 Jun 2016 11:10:27 +0000 (11:10 +0000)]
Merge "Rework: Move m1.micro RAM bump to post-install."

8 years agoMerge "Rework: Move nailgun timeout patch to postinstall"
Alexandru Avadanii [Mon, 13 Jun 2016 11:10:21 +0000 (11:10 +0000)]
Merge "Rework: Move nailgun timeout patch to postinstall"

8 years agoMerge "Cleanup: Drop obsoleted hardcode, now in fixture."
Alexandru Avadanii [Mon, 13 Jun 2016 11:10:09 +0000 (11:10 +0000)]
Merge "Cleanup: Drop obsoleted hardcode, now in fixture."

8 years agoMerge "Fix: f-w: Nailgun `current_release` obsoleted."
Alexandru Avadanii [Mon, 13 Jun 2016 11:09:56 +0000 (11:09 +0000)]
Merge "Fix: f-w: Nailgun `current_release` obsoleted."

8 years agoRework: Move m1.micro RAM bump to post-install. 09/15409/2
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>
8 years agoRework: Move nailgun timeout patch to postinstall 07/15407/2
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>
8 years agoRework: Move xz/gzip switch to post-install. 99/15399/2
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>
8 years agoFix: f-w: Nailgun `current_release` obsoleted. 93/15393/2
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>
8 years agoRework: Move fuel-astute patch to post-install. 49/15349/3
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>
8 years agoCleanup: Drop obsoleted hardcode, now in fixture. 01/15401/1
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>
8 years agopost-scripts: Enable systemd-binfmt for first boot. 41/15341/2
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>
8 years agoFIXME: Temporary: Backport: build local mirrors. 29/15329/1
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>
8 years agoRebase: p/f/deploy-reap-extra-eth: context update. 05/15305/1
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>
8 years agoRebase: rm p/f/Allow-customizing-fuel-plugin-odl. 03/15303/2
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>
8 years agoFix: f-l: s/nailgun::/fuel::/cobbler::preseed. 23/15123/2
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>
8 years agoFIXME: Temporary: Remove repo-mirror-cz.patch. 33/15033/2
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

8 years agoMerge "Fuel deploy: timestamp for newly created images"
Alexandru Avadanii [Wed, 8 Jun 2016 14:50:35 +0000 (14:50 +0000)]
Merge "Fuel deploy: timestamp for newly created images"

8 years agoMerge "Rebase: deploy related patch series."
Alexandru Avadanii [Wed, 8 Jun 2016 14:36:36 +0000 (14:36 +0000)]
Merge "Rebase: deploy related patch series."

8 years agoUpdated armband
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>
8 years agoUpdated armband
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>
8 years agoUpdated armband
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>
8 years agoUpdated armband
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>
8 years agoUpdated armband
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>
8 years agoFix: nailgun_syncdb upgrade to Fuel 9.0.1. 25/15125/2
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>
8 years agoMakefile: Mitaka update. 67/15167/1
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>
8 years agoRebase: ODL Fuel plugin arm64 support patch. 37/15037/2
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>
8 years agoFixture: fix wrong identation (missing space) 27/15027/2
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>
8 years agoRebase: p/f-l: Update VGA defaults patch context. 25/15025/2
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.

8 years agoRebase: deploy related patch series. 65/15165/2
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

8 years agoFuel deploy: timestamp for newly created images 33/14233/2
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>
8 years agoMerge "Upstream: p/common.py: catch stderr in exec_cmd."
Alexandru Avadanii [Fri, 3 Jun 2016 12:08:57 +0000 (12:08 +0000)]
Merge "Upstream: p/common.py: catch stderr in exec_cmd."

8 years agoMerge "Upstream: ODL file limit patch was merged upstream"
Alexandru Avadanii [Fri, 3 Jun 2016 12:08:48 +0000 (12:08 +0000)]
Merge "Upstream: ODL file limit patch was merged upstream"

8 years agoMerge "p/Separate-armband-repo no longer needed."
Alexandru Avadanii [Fri, 3 Jun 2016 12:08:37 +0000 (12:08 +0000)]
Merge "p/Separate-armband-repo no longer needed."

8 years agoMerge "Submodule(s) rebase on stable/mitaka."
Alexandru Avadanii [Fri, 3 Jun 2016 12:08:08 +0000 (12:08 +0000)]
Merge "Submodule(s) rebase on stable/mitaka."

8 years agoMerge "Rebase: Sync after Build system uplift to Fuel 9.0"
Alexandru Avadanii [Thu, 2 Jun 2016 18:21:32 +0000 (18:21 +0000)]
Merge "Rebase: Sync after Build system uplift to Fuel 9.0"

8 years agoUpdated armband
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>
8 years agoUpdated armband
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>
8 years agoUpdated armband
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>
8 years agoUpstream: p/common.py: catch stderr in exec_cmd. 21/15021/1
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/

8 years agoUpstream: ODL file limit patch was merged upstream 19/15019/1
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

8 years agop/Separate-armband-repo no longer needed. 17/15017/1
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/

8 years agoSubmodule(s) rebase on stable/mitaka. 15/15015/1
Alexandru Avadanii [Tue, 31 May 2016 20:27:22 +0000 (22:27 +0200)]
Submodule(s) rebase on stable/mitaka.

8 years agoUpdated armband
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>
8 years agoUpdated armband
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

8 years agoUpdated armband
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>
8 years agoRebase: Sync after Build system uplift to Fuel 9.0 13/15013/1
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/

8 years agoUpdated armband
Stefan K. Berg [Tue, 31 May 2016 14:49:36 +0000 (14:49 +0000)]
Updated armband
Project: fuel  ec0c7698cd363b71694ca33e87f65fc382acda8d

Build system uplift to Fuel 9.0/Mitaka

Switching to Fuel 9.0/Mitaka for the build system.

Overhaul of the patching mechanism. 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.

Patch naming made more descriptive.

The reaping mechanism has been slightly modified due to a change in
the naming of the node files when these are generated by the Fuel CLI.

IMPORTANT 1: The package cache mechanism is currently disabled, it is
only possible to install Fuel with a direct internet connection. This
will be fixed in a later change set!

IMPORTANT 2: All plugins has been disabled! As you have re-certified
your plugin with Fuel 9.0, please re-enable it in build/Makefile!

Change-Id: Ia918d16a74b68f89d178e06befe6e8a7a9367bf9
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
8 years agoUpdated armband
Jonas Bjurel [Mon, 30 May 2016 19:26:12 +0000 (19:26 +0000)]
Updated armband
Project: fuel  ebb5b355ba542fc22b8f96f952439251d4b2c90b

Remove residual Lab & configuration DEA and DHA from the unprotected Fuel repo

This needs testing!!!!
On a follow-up release, this also needs rebasement, the libvirt templates
are still in here - they shouldnt, sinse we dont want Lab specific
configs in the Fuel repo.

NOT VERIFIED
DO NOT MERGE

Change-Id: I069ced81b886405463f27f37a6ec78e3748b37b7
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
8 years agoMerge "bootstrap: Add lshw package (also in fuel-mirror)."
Alexandru Avadanii [Thu, 26 May 2016 15:02:17 +0000 (15:02 +0000)]
Merge "bootstrap: Add lshw package (also in fuel-mirror)."

8 years agoMerge "deploy: ipmi adapter: Add <port> config support."
Alexandru Avadanii [Thu, 26 May 2016 15:01:41 +0000 (15:01 +0000)]
Merge "deploy: ipmi adapter: Add <port> config support."

8 years agodeploy: ipmi adapter: Add <port> config support. 29/14529/5
Alexandru Avadanii [Mon, 23 May 2016 20:09:41 +0000 (22:09 +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: Ibff1309b17733af1a6fc8c5008495f42d7ef084a

8 years agoUpdated armband
Jonas Bjurel [Wed, 25 May 2016 21:30:32 +0000 (21:30 +0000)]
Updated armband
Project: fuel  370cf3546e2f5e3a7afa69b4f306bd7c90d44397

More rigorous Fuel environment check

get_env() used to raise an unhandled exception when reap.py was run on a
Fuel node which didn't yet have an environment set up.

Change-Id: I07c37db2d80e416d26fa4fb4907f4e438f1c44e5
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
8 years agoMerge "Fix indentation and add patch-import output"
Alexandru Avadanii [Wed, 25 May 2016 16:14:29 +0000 (16:14 +0000)]
Merge "Fix indentation and add patch-import output"

8 years agoMerge "Fix improper patch rebase"
Alexandru Avadanii [Wed, 25 May 2016 16:14:12 +0000 (16:14 +0000)]
Merge "Fix improper patch rebase"

8 years agoMerge "Correct libvirt template patch"
Alexandru Avadanii [Wed, 25 May 2016 16:13:30 +0000 (16:13 +0000)]
Merge "Correct libvirt template patch"

8 years agoUpdated armband
Jonas Bjurel [Tue, 24 May 2016 17:41:48 +0000 (17:41 +0000)]
Updated armband
Project: fuel  b0b2e869cae884aaed305f2984701dc813a469ec

docs/install-instr: Add target specific cfg sect.

Fuel 8.0 adds support for setting up "Offloading Modes" for
target nodes.

Document how this features should be used (and why/when it's
necessary), and also its common limitation of not being applied
during Verify Networks step (see related Fuel bug report [1]).

While at it, fix minor reference to branch in git tag checkout
instructions, as we'd be in detached HEAD and not on a new branch.

[1] https://jira.opnfv.org/browse/FUEL-134

[Alexandru.Avadanii@enea.com]
Only minor edits and prepared for upstreaming, this is mostly
based on previous work from Florin.

Change-Id: If7a8ca44541903dbeb6db36bc64fe56b132165cb
Signed-off-by: Florin Dumitrascu <florin.dumitrascu@enea.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
8 years agobootstrap: Add lshw package (also in fuel-mirror). 87/14587/1
Alexandru Avadanii [Tue, 24 May 2016 14:14:18 +0000 (16:14 +0200)]
bootstrap: Add lshw package (also in fuel-mirror).

Until Ubuntu Trusty fixes the following bug on AArch64 [1]:
"AArch64: slow cpuinfo due to redundant loop"
we will be using a patched version of <lshw> from Armband MOS repos.

This change enforces replacing the lshw from Ubuntu with our custom,
patched package.

[1] https://bugs.launchpad.net/ubuntu/+source/lshw/+bug/1582181

Change-Id: Ie10c7819f305accf2a2c2045b1c350880e4c25b6
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
8 years agoFix indentation and add patch-import output 83/14583/1
Stanislaw Kardach [Tue, 24 May 2016 14:25:13 +0000 (16:25 +0200)]
Fix indentation and add patch-import output

I've added submodule name to `patch-import` target to make it easier to
spot in which submodule does patch import fail.

Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com>
8 years agoFix improper patch rebase 81/14581/1
Stanislaw Kardach [Tue, 24 May 2016 14:21:06 +0000 (16:21 +0200)]
Fix improper patch rebase

Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com>
8 years agoCorrect libvirt template patch 79/14579/1
Stanislaw Kardach [Tue, 24 May 2016 09:24:27 +0000 (11:24 +0200)]
Correct libvirt template patch

Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com>
8 years agoMerge "Rebase: p/fuel-web: Drop obsoleted qemu doc patch."
Stanislaw Kardach [Tue, 24 May 2016 08:18:50 +0000 (08:18 +0000)]
Merge "Rebase: p/fuel-web: Drop obsoleted qemu doc patch."

8 years agoUpdated armband
Manuel Buil [Thu, 19 May 2016 11:30:25 +0000 (13:30 +0200)]
Updated armband
Project: fuel  439f684991c36f61483b12134a8c981f78f0e473

Remove coexistence configuration from post script

This is not more needed as the config comes from FUEL ODL plug-in

Change-Id: Ie09a52ac3919ac641924d41431dc000910e6d4f4
Signed-off-by: Manuel Buil <manuel.buil@ericsson.com>
8 years agoRebase: p/fuel-web: Drop obsoleted qemu doc patch. 97/14197/1
Alexandru Avadanii [Mon, 16 May 2016 15:05:14 +0000 (17:05 +0200)]
Rebase: p/fuel-web: Drop obsoleted qemu doc patch.

Upstream moved documentation from local repo to fuel-docs in [1].

While looking at this patch, I think we should drop this change
altogether, since qemu-user-static is not needed inside the
docker builder container, at least not until we start using it
for cross-builds, which is highly unlikely anyway.

qemu-user-static should always be automatically installed as a
dependency of fuel-agent, and NOT by explicit request.

[1] https://github.com/openstack/fuel-web/commit/
    eb673991cc99c5dadb251f922adb08abb40a8bad

Change-Id: Iad7f659fd5ff81e92860508fad58bac519158c47

8 years agoRebase: WSREP rsync patches 77/14177/3
Alexandru Avadanii [Mon, 16 May 2016 14:48:11 +0000 (16:48 +0200)]
Rebase: WSREP rsync patches

Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com>
Change-Id: Ic5cc1109df04a95a5e072ab3acb79eb89427a1e0

8 years agoMerge "Rebase: p/fuel-library: CirrOS direct kernel boot"
Alexandru Avadanii [Mon, 16 May 2016 14:43:33 +0000 (14:43 +0000)]
Merge "Rebase: p/fuel-library: CirrOS direct kernel boot"

8 years agoRebase: p/fuel-web: Add AArch64 s/Liberty/Mitaka/. 37/14137/2
Alexandru Avadanii [Fri, 13 May 2016 23:00:24 +0000 (01:00 +0200)]
Rebase: p/fuel-web: Add AArch64 s/Liberty/Mitaka/.

Change patch adding Liberty on aarch64 support to
adding the following Openstack releases instead:

- Mitaka on Ubuntu 14.04 (aarch64)
- Mitaka on Ubuntu+UCA 14.04 (aarch64)

Signed-off-by: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Change-Id: Ib3f782eccb3d58786d8f99cfd10674cef214d239

8 years agoRebase: p/fuel-web: Disable s/Liberty/Mitaka/. 35/14135/3
Alexandru Avadanii [Fri, 13 May 2016 22:16:24 +0000 (00:16 +0200)]
Rebase: p/fuel-web: Disable s/Liberty/Mitaka/.

Update patch for disabling Opentack release(s).

Fuel now introduced <Mitaka on Ubuntu+UCA 14.04>,
so disable that too for x86_64.

Change-Id: I431357bfc6edd3ae0b2567ee5b59c4a1b4deb9b2
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
8 years agoRebase: p/fuel-main: Drop armband RPM repo patch. 33/14133/2
Alexandru Avadanii [Fri, 13 May 2016 21:37:24 +0000 (23:37 +0200)]
Rebase: p/fuel-main: Drop armband RPM repo patch.

Since Fuel 9.0 drops containers on Fuel master (see spec
"Get rid of docker containers on the master node"), we
no longer need to add the armband RPM repo config to the
cobbler container for cobbler-grub-aarch64.

[1] https://blueprints.launchpad.net/fuel/+spec/
    get-rid-docker-containers

Change-Id: Ia23482226e81f83c1eb50c239346a3686206d5bf

8 years agoRebase: p/f-{main,lib}: cobbler-grub-aarch64 dep. 31/14131/2
Alexandru Avadanii [Fri, 13 May 2016 21:14:08 +0000 (23:14 +0200)]
Rebase: p/f-{main,lib}: cobbler-grub-aarch64 dep.

Since Fuel 9.0 drops containers on Fuel master (see spec
"Get rid of docker containers on the master node"), we
need to handle the install of cobbler-grub-aarch64 in a
different place.

So, handle cobbler-grub-aarch64 loader install as a cobbler
dependency in puppet.

[1] https://blueprints.launchpad.net/fuel/+spec/
    get-rid-docker-containers

Change-Id: Ia42211b4d0aa54ba67862f30f8c7975d2aa09392

8 years agoRebase: p/fuel-main: Refresh after pkglist update. 29/14129/2
Alexandru Avadanii [Fri, 13 May 2016 20:17:14 +0000 (22:17 +0200)]
Rebase: p/fuel-main: Refresh after pkglist update.

Upstream commit:
"Update package list required for building ISO" [1]

[1] https://github.com/openstack/fuel-main/commit/
    18f2c14a928bf3e92ccd4d868953361bed61614b

Change-Id: I59af524de7539489ad4dce12894573f8ff1ac5a5

8 years agoRebase: p/fuel-library: Update after 96da5b4a. 21/14121/3
Alexandru Avadanii [Fri, 13 May 2016 17:37:20 +0000 (19:37 +0200)]
Rebase: p/fuel-library: Update after 96da5b4a.

Refresh patches after:
"Move openstack specific tasks to their own folder structure"

NOTE: The qemu-kvm change patch
(0003-Make-qemu-kvm-architecture-aware.patch) only affects
RedHat systems, so it is optional, at least for the current stage.

[1] https://github.com/openstack/fuel-library/commit/
    96da5b4a1eb82a76fb416d93f5249dc32e2499f2

Change-Id: Ibd1fd3f7e45d7947c90336bbe7e2ace101b5802b

8 years agoRebase: p/fuel-library: nailgun -> fuel module. 17/14117/3
Alexandru Avadanii [Fri, 13 May 2016 17:04:32 +0000 (19:04 +0200)]
Rebase: p/fuel-library: nailgun -> fuel module.

Upstream introduced two related changes, requiring a rebase:

- Remove nailgun module [1]

- Remove CentOS based bootstrap image support [2]

[1] https://github.com/openstack/fuel-library/commit/
    74a68f493ff215ce8dfc67c3af6d06dd5a2db194

[2] https://github.com/openstack/fuel-library/commit/
    3e1320bfcf4a8688d4bfb577a1330121390bafc0

Change-Id: I27279a2fd76d269d482a3eb25e9dba41bc669280

8 years agoRebase: p/fuel-astute: Reduce patch context. 15/14115/2
Alexandru Avadanii [Fri, 13 May 2016 16:14:14 +0000 (18:14 +0200)]
Rebase: p/fuel-astute: Reduce patch context.

Change-Id: Ic11f7c4caa801df32d12461b39e10df8f07460a7

8 years agoMerge "Rebase: p/fuel-agent: Update UEFI after ec71a42."
Alexandru Avadanii [Mon, 16 May 2016 11:50:26 +0000 (11:50 +0000)]
Merge "Rebase: p/fuel-agent: Update UEFI after ec71a42."

8 years agoMerge "Rebase: p/fuel-agent: Patch context refresh."
Alexandru Avadanii [Mon, 16 May 2016 11:50:09 +0000 (11:50 +0000)]
Merge "Rebase: p/fuel-agent: Patch context refresh."

8 years agoMerge "Rebase: p/opnfv-fuel: Drop upstream patches."
Alexandru Avadanii [Mon, 16 May 2016 11:49:58 +0000 (11:49 +0000)]
Merge "Rebase: p/opnfv-fuel: Drop upstream patches."

8 years agoMerge "Rebase: p/opnfv-fuel: Allow Fuel commit override."
Alexandru Avadanii [Mon, 16 May 2016 11:48:47 +0000 (11:48 +0000)]
Merge "Rebase: p/opnfv-fuel: Allow Fuel commit override."

8 years agoMerge "Colorado: Rebase git submodules on stable/mitaka."
Alexandru Avadanii [Mon, 16 May 2016 11:48:26 +0000 (11:48 +0000)]
Merge "Colorado: Rebase git submodules on stable/mitaka."

8 years agoFix improperly exported patches 73/14173/2
Stanislaw Kardach [Sun, 15 May 2016 06:55:11 +0000 (23:55 -0700)]
Fix improperly exported patches

Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com>
8 years agoRebase: p/fuel-library: CirrOS direct kernel boot 75/14175/2
Stanislaw Kardach [Mon, 16 May 2016 01:35:25 +0000 (18:35 -0700)]
Rebase: p/fuel-library: CirrOS direct kernel boot

Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com>
Change-Id: I12126a39c90abf8fc5bef449506e87dc190a50ee

8 years agoIncrease open file limit for OpenDaylight 71/14171/2
Stanislaw Kardach [Sun, 15 May 2016 01:14:43 +0000 (18:14 -0700)]
Increase open file limit for OpenDaylight

Upstart scripts by default do not run scripts in a shell which results
in limits from `/etc/security/limits.conf` not be taken into account
and results in the default value (4096) to be taken. This may prove
problematic for OpenDaylight during initialization. On Cavium ThunderX
we have noticed OpenFlow controller initialization failures caused by
hitting this limit.
OPNFV is increasing the `nofile` limit to 112640 for OpenStack services
which is why I'm using this value here.
Bug report filed to Fuel@OPNFV (see [1]).

[1] https://jira.opnfv.org/browse/FUEL-140

Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com>
8 years agoUpdate Cavium email domain 69/14169/1
Stanislaw Kardach [Sat, 14 May 2016 16:35:34 +0000 (09:35 -0700)]
Update Cavium email domain

Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com>
8 years agoRebase: p/fuel-agent: Update UEFI after ec71a42. 13/14113/1
Alexandru Avadanii [Fri, 13 May 2016 16:09:16 +0000 (18:09 +0200)]
Rebase: p/fuel-agent: Update UEFI after ec71a42.

Rebase after upstream change [1]:
"Grub stage1 shall be installed on all of disks"

[1] https://github.com/openstack/fuel-agent/commit/
    c71a424b9552c07ef1f8a068bedea9563cbe45c

8 years agoRebase: p/fuel-agent: Patch context refresh. 11/14111/1
Alexandru Avadanii [Fri, 13 May 2016 16:00:15 +0000 (18:00 +0200)]
Rebase: p/fuel-agent: Patch context refresh.

8 years agoRebase: p/opnfv-fuel: Drop upstream patches. 09/14109/1
Alexandru Avadanii [Fri, 13 May 2016 15:51:20 +0000 (17:51 +0200)]
Rebase: p/opnfv-fuel: Drop upstream patches.

While we're at it, fix minor context in remaining patch.