armband.git
8 years agoColorado: Rebase git submodules on stable/mitaka. 01/14101/2
Alexandru Avadanii [Fri, 13 May 2016 15:30:47 +0000 (17:30 +0200)]
Colorado: Rebase git submodules on stable/mitaka.

Since fuel-plugin-opendaylight and fuel are OPNFV components,
they do not have a stable/mitaka branch, so use master for them.

Change-Id: Ie8ae0e458953bae7006e0d411b4680f20b87a13c
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
8 years agodocs/install-instr: AArch64 FW, plugins refresh. 61/14061/2
Alexandru Avadanii [Thu, 12 May 2016 19:58:54 +0000 (21:58 +0200)]
docs/install-instr: AArch64 FW, plugins refresh.

- edit image with unexisting plugins on AArch64;
- change "BIOS" references to "UEFI" and add note(s) about
  required firmware support;
- add warning about bootstrap image build fuelmenu config;

Change-Id: I5bcf208dcb0c95e9c09f4da0bd4e861e19d34cc0
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
8 years agodocs/install-instr: Add MySQL WSREP SST provider. 59/14059/2
Alexandru Avadanii [Thu, 12 May 2016 18:56:48 +0000 (20:56 +0200)]
docs/install-instr: Add MySQL WSREP SST provider.

Document workaround for xtrabackup issues on AArch64 controllers.

Change-Id: I126c730f751f09a4d75ac345d9b889df9414de2d

8 years agodocs/install-instr: Refactor target specific cfg. 55/14055/2
Alexandru Avadanii [Thu, 12 May 2016 16:44:28 +0000 (18:44 +0200)]
docs/install-instr: Refactor target specific cfg.

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).

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.

Change-Id: If7a8ca44541903dbeb6db36bc64fe56b132165cb

8 years agoMerge "docs/instal-instr: Add bash code-block markup."
Alexandru Avadanii [Thu, 12 May 2016 14:00:04 +0000 (14:00 +0000)]
Merge "docs/instal-instr: Add bash code-block markup."

8 years agoMerge "docs/install-instr: Fix git clone URL for HTTPS."
Alexandru Avadanii [Thu, 12 May 2016 13:59:26 +0000 (13:59 +0000)]
Merge "docs/install-instr: Fix git clone URL for HTTPS."

8 years agoMerge "docs/install-instr: Add AArch64 specifics."
Alexandru Avadanii [Thu, 12 May 2016 13:58:41 +0000 (13:58 +0000)]
Merge "docs/install-instr: Add AArch64 specifics."

8 years agoMerge "docs/release-notes: Add protocol handler to ref."
Alexandru Avadanii [Thu, 12 May 2016 13:57:48 +0000 (13:57 +0000)]
Merge "docs/release-notes: Add protocol handler to ref."

8 years agoMerge "docs: FIXME: Silence compatible hardware list."
Alexandru Avadanii [Thu, 12 May 2016 13:56:27 +0000 (13:56 +0000)]
Merge "docs: FIXME: Silence compatible hardware list."

8 years agoMerge "docs: Drop references to x86_64 specific docs."
Alexandru Avadanii [Thu, 12 May 2016 13:55:32 +0000 (13:55 +0000)]
Merge "docs: Drop references to x86_64 specific docs."

8 years agodeploy.sh: read TARGET_LAB and TARGET_POD 23/14023/1
Josep Puigdemont [Thu, 12 May 2016 13:37:26 +0000 (15:37 +0200)]
deploy.sh: read TARGET_LAB and TARGET_POD

Read both TARGET_LAB and TARGET_POD from the command line parameters
passed to Fuel's build script. We need these to find local_env.

Change-Id: I288dedeb75001b0983e63e68e993b2a35fd6f6fc
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
8 years agodocs/instal-instr: Add bash code-block markup. 67/13967/2
Alexandru Avadanii [Wed, 11 May 2016 21:40:28 +0000 (23:40 +0200)]
docs/instal-instr: Add bash code-block markup.

Change-Id: I04b97451d9b411d727b0ef51f1fc329510a286bb

8 years agodocs/install-instr: Fix git clone URL for HTTPS. 63/13963/2
Alexandru Avadanii [Wed, 11 May 2016 21:34:25 +0000 (23:34 +0200)]
docs/install-instr: Fix git clone URL for HTTPS.

Drop unnecessary <user>@, not needed for http downloads.
Also, fix typo (missing letter) in opnfv.org domain name.

While we're at it, fix small typo in Ceilometer name too.

Change-Id: I58fa3a3f7f4a216b00d39174aae98da9328418d6

8 years agodocs/install-instr: Add AArch64 specifics. 61/13961/1
Alexandru Avadanii [Wed, 11 May 2016 21:29:22 +0000 (23:29 +0200)]
docs/install-instr: Add AArch64 specifics.

Change-Id: I0ce904da2f18e1d5e032181dbcd0d7b35aabfdff

8 years agodocs/release-notes: Add protocol handler to ref. 59/13959/1
Alexandru Avadanii [Wed, 11 May 2016 20:28:49 +0000 (22:28 +0200)]
docs/release-notes: Add protocol handler to ref.

Doc build fails to create a link for www.opnfv.org because it
does not explicitly specify the protocol handler.

Make doc build happy by adding "http://" prefix.

Change-Id: I7dc9c362f13bac1687d139942826eb1208556a37

8 years agodocs: FIXME: Silence compatible hardware list. 57/13957/1
Alexandru Avadanii [Wed, 11 May 2016 20:20:03 +0000 (22:20 +0200)]
docs: FIXME: Silence compatible hardware list.

We do not have a comprehensive public hardware compatibility list
for AArch64 hardware yet, so silently remove the link to such a
thing in the installer instructions for now.

Once the page is in place, update the reference and revert this
commit.

8 years agodocs: Drop references to x86_64 specific docs. 53/13953/1
Alexandru Avadanii [Wed, 11 May 2016 20:08:19 +0000 (22:08 +0200)]
docs: Drop references to x86_64 specific docs.

Previously, build instructions and release notes kept links to
x86_64 documentation, it is now safe to drop them, as our docs
are very similar.

8 years agoMerge "docs/installation-instruction.rst for AArch64"
Alexandru Avadanii [Wed, 11 May 2016 19:42:09 +0000 (19:42 +0000)]
Merge "docs/installation-instruction.rst for AArch64"

8 years agodocs/installation-instruction.rst for AArch64 41/13941/1
Florin Dumitrascu [Wed, 11 May 2016 16:25:15 +0000 (19:25 +0300)]
docs/installation-instruction.rst for AArch64

Signed-off-by: Florin Dumitrascu <florin.dumitrascu@enea.com>
8 years agoCleanup: README.md small rework. 37/13937/1
Alexandru Avadanii [Wed, 11 May 2016 16:23:06 +0000 (18:23 +0200)]
Cleanup: README.md small rework.

While doing minor reworking, also change submodule add intstr from
ssh to https URLs, so simply building this does not require a github
account to be locally configured.

Change-Id: I915e9cdbbe0185e5d637bf9ddad96d92f94c0b01

8 years agodocs/build-instruction.rst: Cleanup, refactor tags. 27/13927/1
Alexandru Avadanii [Wed, 11 May 2016 13:46:09 +0000 (15:46 +0200)]
docs/build-instruction.rst: Cleanup, refactor tags.

Add missing bash (console) code-block tags to commands and preformatted
output / configuration sections.

While we're at it, fix git clone URL for https, and clarify a few
paragraphs.

Change-Id: Ifb1ef0a8a9befa57e68255354957e094a124ab7e

8 years agoMerge "Cleanup: rm TODO, fix license header."
Alexandru Avadanii [Tue, 10 May 2016 21:19:15 +0000 (21:19 +0000)]
Merge "Cleanup: rm TODO, fix license header."

8 years agoMerge "UX: Fix: rtc-efi blacklist for Ubuntu targets."
Alexandru Avadanii [Tue, 10 May 2016 21:18:50 +0000 (21:18 +0000)]
Merge "UX: Fix: rtc-efi blacklist for Ubuntu targets."

8 years agodocs/build-instruction.rst: Armband refresh. 49/13849/5
Alexandru Avadanii [Tue, 10 May 2016 14:23:11 +0000 (16:23 +0200)]
docs/build-instruction.rst: Armband refresh.

Change-Id: I92b2024df53c392eaeea6a76c9d44b94b83b7f56

8 years agoCleanup: rm TODO, fix license header. 67/13867/2
Alexandru Avadanii [Tue, 10 May 2016 20:37:48 +0000 (22:37 +0200)]
Cleanup: rm TODO, fix license header.

While we're at it, fix default setting for net.ifnames in arm64
fixture.

Also, renumber some patches to eliminate duplicate prefixes
resulted from parallel development of patch sets.

Change-Id: Ibd8cc1f6f8916ad79527f2060a1a2725d557b2c2

8 years agoUX: Fix: rtc-efi blacklist for Ubuntu targets. 01/13801/2
Alexandru Avadanii [Mon, 9 May 2016 19:50:08 +0000 (21:50 +0200)]
UX: Fix: rtc-efi blacklist for Ubuntu targets.

Previously, rtc-efi module was blacklisted in fuel-library preseed
cobbler template, which is not used for Ubuntu target nodes.

Fix by instead blacklisting rtc-efi in cloud-init jinja2 template.

Change-Id: I325f8d1f411f51d494df7c738f1933445d996ff6

8 years agoMerge "Increase maximum shell command timeout to 2h"
Alexandru Avadanii [Tue, 10 May 2016 15:10:32 +0000 (15:10 +0000)]
Merge "Increase maximum shell command timeout to 2h"

8 years agoIncrease maximum shell command timeout to 2h 09/13809/3
Stanislaw Kardach [Tue, 10 May 2016 01:59:00 +0000 (18:59 -0700)]
Increase maximum shell command timeout to 2h

Since `execute_shell_command` mcagent is used for building the target
image and the timeout provided in the astute task is just respected on
the Astute level (on mcollective level this timeout is actually a
minumum between value provided and ddl value) we need to increase it
for Armband operation.

Because Armband builds the target image via `qemu-debootstrap`, it can
take more than 1 hour to finish the building. Therefore aside of
increasing the timeout in the Astute task, the maximum timeout value
for mcagent has to be increased.

Change-Id: Iab94e794e36bb7e887e8f334daa46e82fe0c6f94
Signed-off-by: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
8 years agoMerge "deploy/reap.py: Dump extra interfaces information."
Alexandru Avadanii [Tue, 10 May 2016 08:36:55 +0000 (08:36 +0000)]
Merge "deploy/reap.py: Dump extra interfaces information."

8 years agoMerge "UX: Update bootstrap/target build time estimate."
Alexandru Avadanii [Tue, 10 May 2016 08:35:49 +0000 (08:35 +0000)]
Merge "UX: Update bootstrap/target build time estimate."

8 years agoMerge "[fuel] deploy.sh: Add timeout flag on fuel"
Alexandru Avadanii [Tue, 10 May 2016 08:34:19 +0000 (08:34 +0000)]
Merge "[fuel] deploy.sh: Add timeout flag on fuel"

8 years ago[fuel] deploy.sh: Add timeout flag on fuel 77/13777/3
Josep Puigdemont [Mon, 9 May 2016 09:21:38 +0000 (11:21 +0200)]
[fuel] deploy.sh: Add timeout flag on fuel

Some PODs might need to increase the default timeout value.
The patch introduces the -T flag to Fuel's deploy script, that
can be used to set the timeout. If the flag is not given, it
will look into the DEPLOY_TIMEOUT environment variable and use
that value instead, otherwise the default vaule in deploy.py
will be used.

Change-Id: I835473190673dd8646d0da48c2dbd3bb5e13046d
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
8 years agodeploy/reap.py: Dump extra interfaces information. 87/13787/3
Alexandru Avadanii [Mon, 9 May 2016 14:16:49 +0000 (16:16 +0200)]
deploy/reap.py: Dump extra interfaces information.

Since on AArch64, Ubuntu local mirror lacks arm64 packages (see [1]),
Fuel master requires internet connectivity during deploy, and hence
a way to setup such a public (extra) interface automatically.

Previous commit "transplant: Generate extra interfaces config file"
introduced support for passing this information via DEA (override),
which may define a IFCGF_<interface> section in its 'fuel:'
section, containing the necessary keys to produce a ifcfg-<interface>
file, like in this example:

fuel:
   IFCFG_ETH1:
     device: eth1
     ipaddress: 10.0.1.10
     netmask: 255.255.255.0
     gateway: 10.0.1.254

In order for Network Manager to use the newly added interfaces
for outgoing traffic and honor their GATEWAY setting (e.g. if we just
added one public interface), the default route on admin iface (most of
the time called eth0) is disabled when extra interfaces are present.

FIXME: Only supports lowercase interface names, but so does Fuel,
see related bug report [2].

[1] https://jira.opnfv.org/browse/ARMBAND-35
[2] https://jira.opnfv.org/browse/FUEL-136

Change-Id: Idd6fe95a5a73ec172eca17cfd96f23b1a1bc2bee
Signed-off-by: Alexandu Avadanii <alexandru.avadanii@enea.com>
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
8 years agoUX: Update bootstrap/target build time estimate. 89/13789/1
Alexandru Avadanii [Mon, 9 May 2016 15:08:54 +0000 (17:08 +0200)]
UX: Update bootstrap/target build time estimate.

While building for a different architecture (e.g. AArch64 on x86_64),
the bootstrap/target image build may take longer, due to latency
introduced by using qemu-user-static.

Change-Id: I2b57aae73ccc172fea9e53867bcb66e2f950498f
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
8 years agoMerge "docs/release-notes.rst: Armband refresh."
Josep Puigdemont [Mon, 9 May 2016 09:28:09 +0000 (09:28 +0000)]
Merge "docs/release-notes.rst: Armband refresh."

8 years agof_repobuild: Repeat mirror build up to ten times. 49/13749/1
Alexandru Avadanii [Sun, 8 May 2016 20:38:22 +0000 (22:38 +0200)]
f_repobuild: Repeat mirror build up to ten times.

OPNFV ISO build uses fuel-mirror to create a local Ubuntu
partial mirror in nailgun.

Work around temporary mirror issue (e.g. during rsync) by
retrying mirror build up to 10 times.

Change-Id: I8afb0f55b08c1680903a09e07ac96b4d29415ed5
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
8 years agodocs/release-notes.rst: Armband refresh. 59/13459/3
Alexandru Avadanii [Fri, 29 Apr 2016 16:23:36 +0000 (18:23 +0200)]
docs/release-notes.rst: Armband refresh.

Updated release notes document and created JIRA cases for AArch64
newly added features, bug, workarounds etc.

Change-Id: I1db230a9fa62e671f4f302c8f7b202cc5c8f48ca
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
8 years agoRemove ci/deploy directory 37/13737/2
Josep Puigdemont [Sun, 8 May 2016 11:01:35 +0000 (13:01 +0200)]
Remove ci/deploy directory

Change-Id: Ic355364e5fb4215f1ad10f8f961978fa0b071762
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
8 years agodeploy.sh: simple wrapper for fuel@opnfv deploy script 17/13717/5
Josep Puigdemont [Fri, 6 May 2016 21:28:21 +0000 (23:28 +0200)]
deploy.sh: simple wrapper for fuel@opnfv deploy script

Change-Id: I2b94d6fcb20c59d9d776c04561665108e1f035ca
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
8 years agoARMband patches for the fuel@opnfv deploy scripts 15/13715/6
Josep Puigdemont [Sun, 8 May 2016 11:04:07 +0000 (13:04 +0200)]
ARMband patches for the fuel@opnfv deploy scripts

These are a collection of patches that adapt the current Fuel deploy
scripts for mainly two purposes:

  - Make it possible to create a Fuel VM on a remote libvirt server.
    We use the LIBVIRT_DEFAULT_URI environment variable to detect that.
    Local deploys are possible by setting this variable to
    'quemu:///system', or leaving it empty.
    See: https://libvirt.org/remote.html for more details.

  - Make it possible to add additional network interfaces. For this we
    allow the user to pass the "-b bridge" paramter several times, and
    creating a new virtual NIC for each of them, in the same order they
    were given.
    This required a bit of refactoring of the code.

None of the changes above should break backwards compatibility, except
when indicated in the commit (search for CHANGE in the log)

In addition there are some updates to the code that were deemed
necessary, like the ability to retry when executing shell commands
instead of directly failing, and a simplification of the DHA IPMI
adapter.

Change-Id: I8a0cd5b8672383decd861309328137971eaed14b
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
8 years agoMerge "build.sh: move files instead of copying them."
Stanislaw Kardach [Fri, 29 Apr 2016 18:25:35 +0000 (18:25 +0000)]
Merge "build.sh: move files instead of copying them."

8 years agoCleanup: Kill submodules: Remove obsolete patches. 67/13467/1
Alexandru Avadanii [Fri, 29 Apr 2016 18:13:33 +0000 (20:13 +0200)]
Cleanup: Kill submodules: Remove obsolete patches.

Change-Id: Ia4123727913aa401d26cbe1028f30b20b4497961
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
8 years agoCleanup: Kill submodule: fuel-plugin-ovsnfv. 63/13463/1
Alexandru Avadanii [Fri, 29 Apr 2016 17:33:22 +0000 (19:33 +0200)]
Cleanup: Kill submodule: fuel-plugin-ovsnfv.

Change-Id: If1895891c28b7d8d8d109539357475ac578bfc38
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
8 years agoCleanup: Kill submodule: fuel-plugin-qemu. 61/13461/1
Alexandru Avadanii [Fri, 29 Apr 2016 17:27:29 +0000 (19:27 +0200)]
Cleanup: Kill submodule: fuel-plugin-qemu.

Since we only build ODL plugin on arm64 for now, kill
fuel-plugin-qemu submodule in armband repo.

Change-Id: Ib7a6dfe7e1dbd03771e3f28d2769d54659280901
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
8 years agoUpdated documentation for Brahmaputra 3.0 follow-up release 49/13449/1
Jonas Bjurel [Tue, 26 Apr 2016 19:06:02 +0000 (21:06 +0200)]
Updated documentation for Brahmaputra 3.0 follow-up release

READY TO MERGE

Change-Id: Ic481f02375af9be1642791fa6d96856a453c4f29
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
(cherry picked from commit f50747c9ec79b9f89df6a6ba6d680a89bd6a3de3)

8 years agoFix: cobbler: setup.sh: Re-add extra RPM repos. 97/13397/2
Alexandru Avadanii [Thu, 28 Apr 2016 13:04:40 +0000 (15:04 +0200)]
Fix: cobbler: setup.sh: Re-add extra RPM repos.

Commit 69fd98a broke the cobbler yum config, because instead of
re-adding only mos and nailgun repos with file:/// handler, it
kept the docker-specific repo config from ISO build.

Change-Id: I910fe639116a7ea8cb768c0371af0a84b471d0a4

8 years agoFIXME: cobbler: setup.sh: Keep extra RPM repos. 77/13377/1
Alexandru Avadanii [Wed, 27 Apr 2016 23:48:43 +0000 (01:48 +0200)]
FIXME: cobbler: setup.sh: Keep extra RPM repos.

cobbler-grub-aarch64 (arm64 specific loader) is currently
distributed and added to the cobbler docker container during
ISO build using EXTRA_RPM_REPOS envvar mechanism.

However, since this package installs files in a mounted location,
its contents are not persistent, requiring a test and eventual
forced reinstall during container start.

This, of course, requires the package to be available at that point,
which is not currently possible, as we remove the extra RPM repository
entry from yum config at the end of container build.

Hacky temporary workaround:
Keep extra RPM yum config after container is set up, only for cobbler.

TODO: This patch should be dropped once cobbler-grub-aarch64 RPM
package gets upstreamed.

Change-Id: I58e39df2671d79125c68a5ec994db962c103ce01

8 years agobuild.sh: move files instead of copying them. 33/12733/1
Josep Puigdemont [Wed, 27 Apr 2016 15:41:05 +0000 (17:41 +0200)]
build.sh: move files instead of copying them.

Change-Id: Ib59d82067d028a2c946a87747a6975749c85133b
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
8 years agoCleanup: TODO.md: Trim obsolete entries. 27/12727/1
Alexandru Avadanii [Wed, 27 Apr 2016 14:18:39 +0000 (16:18 +0200)]
Cleanup: TODO.md: Trim obsolete entries.

rx-vlan-filter should be documented as a limitation in the current
release, and work for supporting it in bootstrap would not be
justified.

ThunderX network card speed is now parsed from ethtool output via
nailgun-agent and ohai.

Change-Id: If90e48eaf3665c570cd2999e8b6b1775e319bff7

8 years agoMakefile: cleanup: drop time measurement. 25/12725/1
Alexandru Avadanii [Wed, 27 Apr 2016 14:15:21 +0000 (16:15 +0200)]
Makefile: cleanup: drop time measurement.

This is now covered by Jenkins for automatic builds, and not
relevant for manual builds.

Change-Id: I539a7311fa9689405acdfcd05773fd5aaa81fbb0

8 years agoMerge "Makefile: Finalize RPM repo switch."
Josep Puigdemont [Wed, 27 Apr 2016 13:57:36 +0000 (13:57 +0000)]
Merge "Makefile: Finalize RPM repo switch."

8 years agoUpdated armband
Jonas Bjurel [Tue, 26 Apr 2016 19:06:02 +0000 (21:06 +0200)]
Updated armband
Project: fuel  3e535448fe1bad43d810d9b2ccf66f13bb7c10e5

Updated documentation for Brahmaputra 3.0 follow-up release

READY TO MERGE

Change-Id: Ic481f02375af9be1642791fa6d96856a453c4f29
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
(cherry picked from commit f50747c9ec79b9f89df6a6ba6d680a89bd6a3de3)

8 years agoMerge "Revert "WIP: Docs: Update name, add contributors.""
Alexandru Avadanii [Wed, 27 Apr 2016 09:42:43 +0000 (09:42 +0000)]
Merge "Revert "WIP: Docs: Update name, add contributors.""

8 years agoRevert "WIP: Docs: Update name, add contributors." 13/12713/1
Alexandru Avadanii [Wed, 27 Apr 2016 09:41:52 +0000 (09:41 +0000)]
Revert "WIP: Docs: Update name, add contributors."

This reverts commit 95e9bd7670a34ba0e23fa58340f77ec07292d006.

Change-Id: I47ad4b6d870673b9e41742493b7a232c651a461b

8 years agoMakefile: Finalize RPM repo switch. 95/12695/1
Alexandru Avadanii [Mon, 25 Apr 2016 20:16:06 +0000 (22:16 +0200)]
Makefile: Finalize RPM repo switch.

We previously added support for needed RPMs missing from Fuel repos,
by introducing an additional "armband" repository, then ammending
OPNFV ks.cfg{,.orig}; it's time to remove RPM mirror override
LATEST_MIRROR_ID_URL.

Since LATEST_MIRROR_ID_URL is common for mos CentOS and Ubuntu repos,
fill in MIRROR_MOS_UBUNTU instead.

Change-Id: I137ba588f8c3be3339a4b8affb4f84dc5ac9acc8

8 years agoMerge "WIP: Docs: Update name, add contributors."
Stanislaw Kardach [Wed, 27 Apr 2016 01:23:15 +0000 (01:23 +0000)]
Merge "WIP: Docs: Update name, add contributors."

8 years agoMerge "Copy OPNFV docs dir as documentation base."
Stanislaw Kardach [Wed, 27 Apr 2016 01:23:02 +0000 (01:23 +0000)]
Merge "Copy OPNFV docs dir as documentation base."

8 years agoMakefile: Remove MIRROR_UBUNTU_URL hardcode. 93/12693/1
Alexandru Avadanii [Wed, 27 Apr 2016 00:23:35 +0000 (02:23 +0200)]
Makefile: Remove MIRROR_UBUNTU_URL hardcode.

This uses the public Ubuntu archive, which is not only slow,
but oftenly times out.

With the risk of using slightly lagging local mirrors, remove
public archive hard code.

End-users should configure this based on their location/mirrors
if necessary (e.g. out of date closest mirrors).

Change-Id: I3d963d202033b2b75dab3b8f10ee31e5a6940994

8 years agof_repobuild/Makefile: Use python-debian from pip. 91/12691/1
Alexandru Avadanii [Tue, 26 Apr 2016 21:15:15 +0000 (23:15 +0200)]
f_repobuild/Makefile: Use python-debian from pip.

Currently, Ubuntu Trusty provides a broken python-debian package,
that fails to parse foreign architecture (package:any) relationships.

Purge debian package and let pip resolve this dependency, using a
newer version from pypi.

[1] http://lists.alioth.debian.org/pipermail/
    pkg-python-debian-maint/2014-July/001795.html

Change-Id: Iba8f6cb52ad0a92e5d8d2bee4fb066b213991a94

8 years agoRebase: Drop cpio symlink patch (upstream). 79/12679/1
Alexandru Avadanii [Tue, 26 Apr 2016 14:44:37 +0000 (16:44 +0200)]
Rebase: Drop cpio symlink patch (upstream).

Drop p/fuel-main/0003-Make-cpio-accept-symlinks.patch,
since this is now covered by OPNFV commit f544e41,
"Correction due to changed cpio behavior".

For details, see https://jira.opnfv.org/browse/FUEL-125

Change-Id: I6c04e34cb7a5af5681745f1cdd026809c65720ce

8 years agoUpdated armband
Jonas Bjurel [Wed, 20 Apr 2016 12:59:49 +0000 (14:59 +0200)]
Updated armband
Project: fuel  6a42aafa48d339ba3164bd03006a5cf128b55299

Using VLAN segmentation for the NFV-OVS scenarios.
Unfortunately this scenario is hardwired to work with Ericsson POD-2 only

Change-Id: I3a0b56d7ff71e0ec9cd97b8ef5946fb438d43e62
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
(cherry picked from commit 12c2d3403c4638672bbf1443142b8308e828e5f4)

8 years agoUpdated armband
Stefan K. Berg [Fri, 22 Apr 2016 10:48:25 +0000 (12:48 +0200)]
Updated armband
Project: fuel  f544e413ecbbaa25d36f2336bb703565afc8fb38

Correction due to changed cpio behavior

As part of a security fix for cpio, its behavior has changed in terms
of how symlinks are handled.

This is affecting the Fuel build process, for which this commit is a
fix (reverting cpio back to its original behavior by adding the
argument "--extract-over-symlinks" in those instances where this is
needed).

For details, see https://jira.opnfv.org/browse/FUEL-125

Change-Id: I455b11a16ad52d8dd09165165447e4c4a661b45a
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
(cherry picked from commit 2b419db5c9325c6a87f1ea160c42235a1e8ec083)

8 years agoRevert "Makefile: Finalize RPM repo switch." 51/12651/1
Alexandru Avadanii [Mon, 25 Apr 2016 21:52:24 +0000 (21:52 +0000)]
Revert "Makefile: Finalize RPM repo switch."

This reverts commit 5bd40a77a6542d90c36be58d1c2ceece3e85f65f.

Change-Id: I7fff4471c2ec2fad04a4ba00cb6b3b86482dcab9

8 years agoMakefile: Finalize RPM repo switch. 47/12647/2
Alexandru Avadanii [Mon, 25 Apr 2016 20:16:06 +0000 (22:16 +0200)]
Makefile: Finalize RPM repo switch.

We previously added support for needed RPMs missing from Fuel repos,
by introducing an additional "armband" repository, then ammending
OPNFV ks.cfg{,.orig}; it's time to remove RPM mirror override
LATEST_MIRROR_ID_URL.

Since LATEST_MIRROR_ID_URL is common for mos CentOS and Ubuntu repos,
fill in MIRROR_MOS_UBUNTU instead.

Change-Id: I6eb88da6ef2e174b571619a7d12cc134f6508492

8 years agoWIP: Docs: Update name, add contributors. 83/12583/1
Alexandru Avadanii [Fri, 22 Apr 2016 13:44:09 +0000 (15:44 +0200)]
WIP: Docs: Update name, add contributors.

8 years agoCopy OPNFV docs dir as documentation base. 81/12581/1
Alexandru Avadanii [Fri, 22 Apr 2016 13:38:45 +0000 (15:38 +0200)]
Copy OPNFV docs dir as documentation base.

Armband Fuel for aarch64 is very similar to amd64 in both
configuration and deployment, with a small difference in the build
process.

Therefore it makes sense to base our documentation on Jonas'
work in OPNFV Fuel.

8 years agoPass revision version to the build fuel system 63/12563/2
Josep Puigdemont [Fri, 22 Apr 2016 09:07:40 +0000 (11:07 +0200)]
Pass revision version to the build fuel system

Fuel makes use of the REVSTATE variable in the make file to alter the
name of the resulting ISO image. We need to honor the revision specified
by the jenkins build system at OPNFV, and pass this variable along to
fuel@opnfv.

Change-Id: I1f80dfcae313058dd9a4486bbbfdfbb0b52ea405
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
8 years agoIncrease target image build timeout 47/12547/1
Stanislaw Kardach [Thu, 21 Apr 2016 22:42:04 +0000 (15:42 -0700)]
Increase target image build timeout

Currently we're close to 40 minutes of image building (thanks to
qemu-debootstrap). If network connectivity is a bit slow (happened to
me) it's easy to go over 1h limit. Therefore let's push this to 2 hours
to be safer.

Signed-off-by: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
8 years agoMerge changes I6bf15cd4,If96f651a
Alexandru Avadanii [Thu, 21 Apr 2016 13:02:22 +0000 (13:02 +0000)]
Merge changes I6bf15cd4,If96f651a

* changes:
  Correct docker cleaning
  Allow configuring MySQL WSREP SST provider

8 years agobuild.sh: save git URL and revision used for the build. 37/12537/1
Josep Puigdemont [Thu, 21 Apr 2016 11:40:25 +0000 (13:40 +0200)]
build.sh: save git URL and revision used for the build.

Change-Id: I7c812ec697b1d75aafe39f6ad542647c45cc70b6
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
8 years agoCorrect docker cleaning 13/12513/1
Stanislaw Kardach [Wed, 20 Apr 2016 23:34:58 +0000 (16:34 -0700)]
Correct docker cleaning

So there was a very stupid mistake in the docker container cleaning
that this patch fixes.

Signed-off-by: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
8 years agoAllow configuring MySQL WSREP SST provider 11/12511/1
Stanislaw Kardach [Wed, 20 Apr 2016 22:49:06 +0000 (15:49 -0700)]
Allow configuring MySQL WSREP SST provider

On some arm64 platforms xtrabackup is broken due to an outdated
MySQL/InnoDB code that it uses which is missing. To work around that
this patch allows choosing which WSREP SST provider to use. Aside of
already supported `xtrabackup-v2` and `mysqldump`, the `rsync` method
has been added as it is comparable to xtrabackup in terms of speed (or
is faster), has been validated to work on arm64 platforms where
xtrabackup is broken and it doesn't rely on db mechanisms to perform the
state transfer.

This patch is tied to a patch in fuel-web that introduces configuration
options for WSREP SST provider and in case nothing is specified, it
will choose `xtrabackup-v2`.

Signed-off-by: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
8 years agoCleanup patch-export bugs 09/12509/1
Stanislaw Kardach [Wed, 20 Apr 2016 22:45:31 +0000 (15:45 -0700)]
Cleanup patch-export bugs

8 years agobuild.sh: do not use readlink for unexisting dir 05/12505/2
Josep Puigdemont [Wed, 20 Apr 2016 21:08:35 +0000 (23:08 +0200)]
build.sh: do not use readlink for unexisting dir

The build failed to copy the artifact files to the destination
directory because the variable BUILD_DIRECTORY was empty.
This variable is obtained doing "readlink" on a path, although
at the time of the assignment that path does not exist yet. This
is because it depends on a path inside a submodule that has not
yet been initialized.

We remove readlink on the assignment since we know the path will
already be in a canonicalized form, since it is constructed from
an already canonicalized path.

Change-Id: Icc1113d26b503ff998aebbcd1efe81004859f878
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
8 years agobuild.sh: actually build the ISO. 93/12493/2
Josep Puigdemont [Wed, 20 Apr 2016 15:42:45 +0000 (17:42 +0200)]
build.sh: actually build the ISO.

Change-Id: Ica40e2fd78d6569cc17e6702a094889ae732249a
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
8 years agoMerge "ceilometer: Fix libvirt-bin group name for armband."
Alexandru Avadanii [Mon, 18 Apr 2016 18:17:57 +0000 (18:17 +0000)]
Merge "ceilometer: Fix libvirt-bin group name for armband."

8 years agoMerge "target Ubuntu: Blacklist rtc-efi if not supported."
Alexandru Avadanii [Mon, 18 Apr 2016 18:15:14 +0000 (18:15 +0000)]
Merge "target Ubuntu: Blacklist rtc-efi if not supported."

8 years agoceilometer: Fix libvirt-bin group name for armband. 27/12427/1
Alexandru Avadanii [Mon, 18 Apr 2016 16:51:15 +0000 (18:51 +0200)]
ceilometer: Fix libvirt-bin group name for armband.

Upstream mirrors use a custom version of libvirt, ported from
Debian, while keeping the Ubuntu ceilometer package, leading to a
libvirt group name mismatch between the two.

Fuel-library hardcodes a deb-version test for libvirt-bin, which
enforces the use of "libvirt" instead of "libvirtd" for 1.2.9 or
newer libvirt-bin [1].

Armband brings its own 1.3.2 libvirt-bin package, which respects
Ubuntu standard group naming ("libvirtd"), but since 1.3.2 > 1.2.9,
the old group name ("libvirt") is still used.

This patch extends the version checking introduced in [1]:
 - libvirt-bin 1.3.2 or newer will use "libvirtd" naming;
 - libvirt-bin 1.2.9 ... <1.3.2 will use "libvirt".

[1] https://review.openstack.org/#/c/200602/8/deployment/puppet/
    openstack/manifests/ceilometer.pp

Change-Id: I11861e1863d7971a844c62dc08f22dbbab63b3e1

8 years agoFix build issue introduced by RPM repo switch. 23/12423/1
Alexandru Avadanii [Mon, 18 Apr 2016 15:32:44 +0000 (17:32 +0200)]
Fix build issue introduced by RPM repo switch.

Adding another RPM repo also requires updating ks.cfg{.orig,} in
OPNFV fuel repository.
Update TODO by removing obsolete entries.

Also fix minor unrelated patch whitespace error.

Change-Id: I6a7f271d32c5d9c58aa48658e90e1cdbb0d59fdc

8 years agoMerge "Switch to upstream RPM repos + armband repo-comp."
Alexandru Avadanii [Mon, 18 Apr 2016 14:50:23 +0000 (14:50 +0000)]
Merge "Switch to upstream RPM repos + armband repo-comp."

8 years agoSwitch to upstream RPM repos + armband repo-comp. 95/12395/2
Alexandru Avadanii [Sun, 17 Apr 2016 19:52:48 +0000 (21:52 +0200)]
Switch to upstream RPM repos + armband repo-comp.

Instead of using linux.enea.com for ALL RPM packages for CentOS7,
by overriding FUEL_MIRROR in the Makefile, switch to using
EXTRA_RPM_REPOS variable to point to armband RPM repo-component.

This way, the bulk of RPM packages will be fetched from upstream,
instead of our mirror.

- we no longer have to sync and merge from upstream the RPM repos,
  but only maintain the reduced armband repo-component, currently
  hosting 2 packages (qemu-user-static and cobbler-grub-aarch64);
- it will lower bandwidth usage to armband mirrors;
- first step for merging with upstream the RPM repos;
- easier to integrate with the way OPNFV replaces YUM repos on FM;

Change-Id: I76c1ef3d308c099d523099ea96fb57539ef71e04

8 years agofuel-nailgun-agent: ohai: Read L1 info w/ ethtool. 89/12389/1
Alexandru Avadanii [Sun, 17 Apr 2016 18:07:42 +0000 (20:07 +0200)]
fuel-nailgun-agent: ohai: Read L1 info w/ ethtool.

fuel-nailgun-agent uses ohai and rethtool for reading eth info,
including ethernet card speed. However, current methods rely on the
drivers populating the advertised and/or supported link speed lists.

This is not true for all drivers, especially for some Fibers
that only report the speed via ethtool when the link is up.

This patch adds support for reading L1 info from ohai, which
supports parsing ethtool speed starting with version amos2 [1].

[1] https://linux.enea.com/mos-repos/ubuntu/8.0/pool/main/o/
    ohai/ohai_6.14.0-2~u14.04+mos1+mos8.0+amos2_all.deb

Change-Id: Ic8c252e411a680af32cc68574c572434147a7e78

8 years agotarget Ubuntu: Blacklist rtc-efi if not supported. 87/12387/1
Alexandru Avadanii [Sun, 17 Apr 2016 16:05:24 +0000 (18:05 +0200)]
target Ubuntu: Blacklist rtc-efi if not supported.

Older ThunderX and possibly other UEFI-enabled targets do not support
rtc-efi properly, so they end up filling dmesg with useless
complaints about not being able to read system time.

This adds a simple test for rtc-efi and blacklists it in target OS
(Ubuntu) if not supported.

While we're at it, rename a patch file I missed in a previous rebase
and update TODO.

Change-Id: Ia86b27ad50aca9b0fde50522f2bd15d329726f34

8 years agobootstrap: Add 'armband-rtc-efi-fix' package 85/12385/2
Alexandru Avadanii [Sun, 17 Apr 2016 14:34:18 +0000 (16:34 +0200)]
bootstrap: Add 'armband-rtc-efi-fix' package

Older ThunderX and possibly other UEFI-enabled targets do not support
rtc-efi properly, so they end up filling dmesg with useless
complaints about not being able to read system time.

armband-rtc-efi-fix validates rtc-efi can be used on the system,
otherwise it rmmods rtc_efi kernel module via rcS script.

This patch hardcodes the addition of armband-rtc-ef-fix package during
bootstrap image build.

NOTES:
This could be later removed or, if other fixes need to be delivered
like this, grouped in a meta package.

Target OS (Ubuntu) still needs to be handled, preferably by blacklisting
rtc-efi module and rebuilding initramfs during provisioning.

Fuel 9.0 moved default package list to openstack.yaml fixture, see [1].

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

Change-Id: I57d632e3915058bbb1fc56b3a7fbd5d15787f9d9

8 years agoMerge "Rebase after "Bugfix Broadcast Group"."
Alexandru Avadanii [Sun, 17 Apr 2016 14:44:40 +0000 (14:44 +0000)]
Merge "Rebase after "Bugfix Broadcast Group"."

8 years agoRebase after "Bugfix Broadcast Group". 83/12383/1
Alexandru Avadanii [Sun, 17 Apr 2016 13:13:52 +0000 (15:13 +0200)]
Rebase after "Bugfix Broadcast Group".

While we're at if, fix whitespace errors in affected patches.

Change-Id: Ic14e3e13f9503ab4b9307e55c731825b8a33da3b

8 years agoMakefile: submodules-clean: Add 'git am --abort'. 81/12381/1
Alexandru Avadanii [Sun, 17 Apr 2016 13:00:39 +0000 (15:00 +0200)]
Makefile: submodules-clean: Add 'git am --abort'.

Sometimes patches fail to apply cleanly on patches-import, usually
due to upstream changes.

submodules-clean removes tags and resets HEAD, so it should also
try aborting the git am command.

Change-Id: I7e839383cbcde60deaf9266f24512f985b0b642e

8 years agoUpdated armband
Billy O'Mahony [Fri, 15 Apr 2016 23:08:35 +0000 (00:08 +0100)]
Updated armband
Project: ovsnfv  8a312b9535b2f3fe721139ed37722a13d1a940b1

fuel plugin: Pick updated libudev1 packages.

Package versions of libudev1 packages were bumped from
5ubuntu20.18 to 5ubuntu20.19.

Change-Id: I628b56c1f057699d6ce4021a3a7ae125f759d5ac
Signed-off-by: Billy O'Mahony <billy.o.mahony@intel.com>
Reviewed-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Reviewed-by: Mark D. Gray <mark.d.gray@intel.com>
Reviewed-by: Tom Herbert <therbert@redhat.com>
(cherry picked from commit fe0d98cb53b7ce4b116c0f557376afe326698226)

8 years agoUpdated armband
Billy O'Mahony [Wed, 16 Mar 2016 14:33:27 +0000 (14:33 +0000)]
Updated armband
Project: ovsnfv  0b811a3af8585e229be85f2f6be7b5c36dbbc26a

fuel plugin: Provide required libudev1 version

The latest fuel .iso has changed provided libudev1 version from 20.18 to
20.15.  As the later version is required for the plugin we now provide
it directly in the plugin's repo.

Change-Id: Ida93a9971185d13aa476a6192bca949b854f42af
Signed-off-by: Billy O'Mahony <billy.o.mahony@intel.com>
Reviewed-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Reviewed-by: Mark D. Gray <mark.d.gray@intel.com>
Reviewed-by: Tom Herbert <therbert@redhat.com>
Reviewed-by: Michal Skalski <mskalski@mirantis.com>
Reviewed-by: Stefan Berg <stefan.k.berg@ericsson.com>
(cherry picked from commit 5181fb94a7485af207c1232753eeb74fb8975b1a)

8 years agoMerge "build.sh: added initial build script"
Alexandru Avadanii [Fri, 15 Apr 2016 15:46:54 +0000 (15:46 +0000)]
Merge "build.sh: added initial build script"

8 years agobuild.sh: added initial build script 51/12351/1
Josep Puigdemont [Fri, 15 Apr 2016 15:14:36 +0000 (17:14 +0200)]
build.sh: added initial build script

Change-Id: Icf8662682b65254c42ca752a14e19b0e08d65853
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
8 years agoUpdated armband
Nikolas Hermanns [Fri, 15 Apr 2016 13:22:34 +0000 (15:22 +0200)]
Updated armband
Project: fuel  c6e6a032ce80f6b8a781383ebe72f3ca9572b268

[VPNSERVICE] Bugfix Broadcast Group

The local broadcast group was not updated
correctly in ODL. This commit includes the
bugfix.

Change-Id: I7857bcdc543217d513683bf91ab13fa93ba2ed42

8 years agoUpdated armband
Nikolas Hermanns [Thu, 14 Apr 2016 14:15:07 +0000 (16:15 +0200)]
Updated armband
Project: fuel  8ac63ae166d30c1bec46b5159b2d2362be5b325f

Adding patch for Broadcast Storm of vpnservice

There is no persisten release from stable/beryllium
with the bugfix https://git.opendaylight.org/gerrit/#/c/37566/
included. So we have to overwrite the file we a own
build.

Change-Id: I637c333fa2175544f182cd1f7b774501d3fc2c25

8 years agoUpdated armband
Michal Skalski [Wed, 13 Apr 2016 11:15:17 +0000 (13:15 +0200)]
Updated armband
Project: fuel  e70b1575651518c6d3d247b59c303e54c9d586ec

Fix odl haproxy configuration

In rare cases ODL haproxy configuration had been deployed before
haproxy service was ready. This patch should force proper order.

Change-Id: I7c90a57bab5e3388bf29aefabe6ed9380d1303f6
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
(cherry picked from commit a71ccaa852a7a0091fce50045f29ab5119a7811b)

8 years agoUpdated armband
Billy O'Mahony [Tue, 12 Apr 2016 14:00:28 +0000 (15:00 +0100)]
Updated armband
Project: ovsnfv  6795067e538388078afc8b1f71b6e8224339da81

fuel plugin: Pick updated libudev packages.

Package versions of libudev-dev_204 packages were bumped from
5ubuntu20.18 to 5ubuntu20.19.

Change-Id: Ie43635c1ab3180a307475e0b47b082fe1cad6ae1
Signed-off-by: Billy O'Mahony <billy.o.mahony@intel.com>
Reviewed-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Reviewed-by: Mark D. Gray <mark.d.gray@intel.com>
Reviewed-by: Tom Herbert <therbert@redhat.com>
Reviewed-by: Michal Skalski <mskalski@mirantis.com>
(cherry picked from commit a1f15bb1c833079d49affab36bb4bb20ca73dafd)

8 years agoRebase after "redo config of plugin build". 93/12193/1
Alexandru Avadanii [Tue, 12 Apr 2016 14:44:20 +0000 (16:44 +0200)]
Rebase after "redo config of plugin build".

Change-Id: If0d4c64742d0984f32c7c68bc903332ceea656e9

8 years agoUpdated armband
Nikolas Hermanns [Mon, 11 Apr 2016 12:46:05 +0000 (14:46 +0200)]
Updated armband
Project: fuel  6597153801bc56a8d273ebd38b6cace45b5f3c4a

Redo config of plugin build

- Split up config into a new config file
- add revision to better point to a branch
  instrad of a revision.

Change-Id: I341138973b56fb0807478ee08cab039ab31d6503

8 years agoUpdated armband
Billy O'Mahony [Mon, 11 Apr 2016 16:19:18 +0000 (16:19 +0000)]
Updated armband
Project: ovsnfv  456f72770de91a7489962d962efc823d3d5ceec8

fuel plugin: Pick updated pcre packages.

Package versions of pcre 8.31 packages were bumped from 2ubuntu2.1 to
2ubuntu2.2.

Change-Id: I5a48af87ff36375f41f2bb12b20c4c4d272d00c6
Signed-off-by: Billy O'Mahony <billy.o.mahony@intel.com>
Reviewed-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Reviewed-by: Mark D. Gray <mark.d.gray@intel.com>
Reviewed-by: Tom Herbert <therbert@redhat.com>
Reviewed-by: Michal Skalski <mskalski@mirantis.com>
(cherry picked from commit 37c978c1fa84cd20f449aa1de7a74024cc9a8d13)

8 years agoUpdated armband
Billy O'Mahony [Fri, 8 Apr 2016 09:22:26 +0000 (10:22 +0100)]
Updated armband
Project: ovsnfv  9be3edaf948cc28c6e879fa71daf4927dd3ed0d4

fuel plugin: Fix mechanism driver config

This fixes the yardstick ping test. And hopefully other y/s tests.

Add ovs to the mechanism driver search list so that neutron agent
continues to work with the kernel ovs on the non-compute nodes.

This enables the router on the control node and makes VMs accessible via
public ip addresses.

Change-Id: Ife08e63e8bf9358cc24eb610b3d7611484b3151f
Signed-off-by: Billy O'Mahony <billy.o.mahony@intel.com>
Reviewed-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Reviewed-by: Mark D. Gray <mark.d.gray@intel.com>
Reviewed-by: Tom Herbert <therbert@redhat.com>
Reviewed-by: Michal Skalski <mskalski@mirantis.com>
Reviewed-by: Stefan Berg <stefan.k.berg@ericsson.com>
(cherry picked from commit b5b4ea732e18c5450c663c6f84f289eb6acadf4b)

8 years agoRebase on upstream update 35/12135/1
Stanislaw Kardach [Mon, 11 Apr 2016 10:39:48 +0000 (12:39 +0200)]
Rebase on upstream update