fuel.git
7 years ago[mcp] Copy ssh key to tmp dir 43/35943/1
Andrii Ostapenko [Fri, 9 Jun 2017 11:39:18 +0000 (14:39 +0300)]
[mcp] Copy ssh key to tmp dir

Copy ssh key to tmp dir to be able to retrieve
OS credentials by releng/utils/fetch_os_creds.sh

Also adds 'set -x' to ci/deploy.sh

Change-Id: I056c626288862f84f47c947461894730ce0483ac
Signed-off-by: Andrii Ostapenko <aostapenko@mirantis.com>
7 years ago[mcp] Mend dpdk scenario 33/35733/3
Michael Polenchuk [Fri, 2 Jun 2017 12:39:58 +0000 (16:39 +0400)]
[mcp] Mend dpdk scenario

Make a reboot of the compute nodes to activate hugepages support
and re-apply required states then. Also align ovs lcore & pmd
masks with two cpu nodes.

Change-Id: I4a5defe6f08e912aba2d939ba5ba057af768a40c
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years ago[mcp] Bring in dpdk scenario support 67/35567/1
Michael Polenchuk [Wed, 31 May 2017 12:12:43 +0000 (16:12 +0400)]
[mcp] Bring in dpdk scenario support

Change-Id: Ifd6d61026a0e98e8faf59c7d218333122d70ffe9
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years ago[mcp] Mend installation scripts 79/35479/1
Michael Polenchuk [Mon, 29 May 2017 09:36:25 +0000 (13:36 +0400)]
[mcp] Mend installation scripts

* add/unify ssh options
* get base image to temporary directory
* specify os type for virt install
* fix symbolic link to reclass
* remove outdated fuel submodules

Change-Id: I6833ce78c8fff97e1b89f4e92e6e6b470e9ce99f
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years ago[mcp] Replace reclass system models with submodule 93/35393/3
Michael Polenchuk [Fri, 26 May 2017 08:12:15 +0000 (12:12 +0400)]
[mcp] Replace reclass system models with submodule

Change-Id: Id693f7b0f3542d605b0f71601f3bd21eb882c7ba
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years ago[mcp] Bring in deployment scripts 67/35267/3
Michael Polenchuk [Wed, 24 May 2017 09:52:02 +0000 (13:52 +0400)]
[mcp] Bring in deployment scripts

Change-Id: I7d2af958e447a5892f7cd1f6c6fb8616951e2ff3
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years ago[mcp] Bring in reclass system salt models 61/35261/1
Michael Polenchuk [Wed, 24 May 2017 08:44:05 +0000 (12:44 +0400)]
[mcp] Bring in reclass system salt models

Change-Id: I1a865b7524f3a5242544e60e6b36b1092721c58b
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years agoAdding mpolenchuk@mirantis.com to committers list 93/34993/3
agardner [Thu, 18 May 2017 16:53:39 +0000 (12:53 -0400)]
Adding mpolenchuk@mirantis.com to committers list

Change-Id: I973810e55ea24ba879fd91ac47388d52d43867e2
Signed-off-by: agardner <agardner@linuxfoundation.org>
7 years agof_kvmpluginbuild: Allow overrides in config.mk 35/34435/1
Alexandru Avadanii [Mon, 8 May 2017 14:19:27 +0000 (16:19 +0200)]
f_kvmpluginbuild: Allow overrides in config.mk

Change-Id: I2e124e09b884a06ab84864fbf3f2173224a99fc6
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
7 years agodocs: Refresh reference for Danube 2.0 91/34291/2
Alexandru Avadanii [Thu, 4 May 2017 16:43:22 +0000 (18:43 +0200)]
docs: Refresh reference for Danube 2.0

Change-Id: If786099581cf8bf685cc2076c21d4c3041610bf7
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
7 years agoMerge "Revert "Revert "Select the fastest mirror of repos"""
Alexandru Avadanii [Wed, 3 May 2017 16:45:38 +0000 (16:45 +0000)]
Merge "Revert "Revert "Select the fastest mirror of repos"""

7 years agoRevert "Revert "Select the fastest mirror of repos"" 33/34133/2
Michael Polenchuk [Wed, 3 May 2017 12:44:34 +0000 (12:44 +0000)]
Revert "Revert "Select the fastest mirror of repos""

This reverts commit 7785a18f592ecd6eeb307b7bc2f5b134e8e07221.
https://bugs.launchpad.net/fuel/+bug/1669751 has been resolved.

Change-Id: I009cf6cba8aaa7ff2ae625c5067aa4d1570e4793
JIRA: FUEL-261
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years agoUpdate kvm4nfv commit id 61/34061/2
Yunhong Jiang [Tue, 2 May 2017 19:25:43 +0000 (12:25 -0700)]
Update kvm4nfv commit id

This kvm4nfv commit includes changes for the config file which disable
vt-d by default and has the x2apic enabled.

Change-Id: I2e8085792fb8222dfc59d4ece0ac58ec9a16c1bd
Signed-off-by: Yunhong Jiang <yunhong.jiang@linux.intel.com>
7 years agoMerge "Update the kvm4nfv git commit"
Alexandru Avadanii [Wed, 26 Apr 2017 12:56:21 +0000 (12:56 +0000)]
Merge "Update the kvm4nfv git commit"

7 years agoFix for reap.py giving negative id's for nodes 95/33795/1
Catalina Focsa [Tue, 25 Apr 2017 15:13:12 +0000 (17:13 +0200)]
Fix for reap.py giving negative id's for nodes

Sort node id's as integer values instead of strings
in order to return the actual minimum value
by which the new list of nodes is generated

JIRA: https://jira.opnfv.org/browse/FUEL-208

Change-Id: If59d0d0ff9823076b337b042bceb4a736f1f9153
Signed-off-by: Catalina Focsa <catalina.focsa@enea.com>
7 years agoUpdate the kvm4nfv git commit 69/33769/2
Yunhong Jiang [Tue, 25 Apr 2017 09:03:43 +0000 (02:03 -0700)]
Update the kvm4nfv git commit

Update the kvm4nfv git commit_id to latest kernel, so that it includes
the patch for the bxn driver changes.

Change-Id: I63e58de24d5f993868b6046eb1b93c9e61c9668f
Signed-off-by: Yunhong Jiang <yunhong.jiang@linux.intel.com>
7 years agoMerge "[tacker] Adjust tackerc to v3 of identity api"
Alexandru Avadanii [Mon, 24 Apr 2017 15:30:30 +0000 (15:30 +0000)]
Merge "[tacker] Adjust tackerc to v3 of identity api"

7 years ago[tacker] Adjust tackerc to v3 of identity api 29/33629/1
Michael Polenchuk [Fri, 21 Apr 2017 10:36:41 +0000 (14:36 +0400)]
[tacker] Adjust tackerc to v3 of identity api

JIRA: FUEL-267
Change-Id: Ia0e9ed3298681319c870132628d930175e084bc0
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years agof_repobuild: Add remaining packages explicitly 43/33543/1
Alexandru Avadanii [Fri, 7 Apr 2017 18:01:04 +0000 (20:01 +0200)]
f_repobuild: Add remaining packages explicitly

Packetary automatically solves for Fuel@OPNFV:
- base pkgs and their deps;
- bootstrap/target image additional pkgs;
- explicit reqs;

However, corner cases like "pcs", which is not in any of the
above categories - being installed via puppet only, need to be
added to the explicit list.

NOTE: This enables full offline deploys for simple scenarios
(i.e. without any plugins). Each plugin might need additional
packages, which will be handled in further patches.
See the bug report for more information.

JIRA: FUEL-250

Change-Id: Id1d31c98308cdee6cb935627984188561b560ff4
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
7 years agoMerge "fuel-menu: Align defaults w/ OPNFV bootstrap cfg"
Alexandru Avadanii [Wed, 19 Apr 2017 15:21:32 +0000 (15:21 +0000)]
Merge "fuel-menu: Align defaults w/ OPNFV bootstrap cfg"

7 years ago[kvm-plugin]Modifying kernel modules 17/33117/3
Navya [Fri, 7 Apr 2017 10:07:59 +0000 (15:37 +0530)]
[kvm-plugin]Modifying kernel modules

Omitted the ovs kernel modules from kvmfornfv kernel modules for
the plugin.

Change-Id: Id907b829c843587c7fbd7914e19a243b77e7d5aa
Signed-off-by: Navya Bathula <navyax.bathula@intel.com>
7 years agofuel-menu: Align defaults w/ OPNFV bootstrap cfg 63/33163/1
Alexandru Avadanii [Sun, 9 Apr 2017 12:10:21 +0000 (14:10 +0200)]
fuel-menu: Align defaults w/ OPNFV bootstrap cfg

Instead of overwriting fuel_bootstrap_cli.yaml during post-install,
with a static config which we need to manually sync in OPNFV after
each upstream change, make the whole thing dynamic by syncing (via
patch) fuel-menu's default settings with OPNFV bootstrap.

This allows us to drop the static fuel_bootstrap_cli.yaml.

JIRA: FUEL-266

Change-Id: I132f2a272c764ad0fc84b3e0e0e1222b1fab1cd2
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
7 years agoMerge "build/install: Add USB boot option"
Alexandru Avadanii [Thu, 6 Apr 2017 15:49:42 +0000 (15:49 +0000)]
Merge "build/install: Add USB boot option"

7 years agoMerge "Double allocated memory of fuel master node"
Alexandru Avadanii [Thu, 6 Apr 2017 14:17:40 +0000 (14:17 +0000)]
Merge "Double allocated memory of fuel master node"

7 years agobuild/install: Add USB boot option 67/33067/3
Matei Valeanu [Thu, 6 Apr 2017 10:34:05 +0000 (12:34 +0200)]
build/install: Add USB boot option

Use isohybrid to add MBR for booting via BIOS
from USB flash drives

Also, Makefile "$(wildcard ubuntu-builder/*)" does not expand
to what is expected (does not include ubuntu-builder/Dockerfile),
as it uses a previous cached value.
Check this link for an explanation:
http://stackoverflow.com/questions/41470676/makefile-variable-expansion-with-wildcard-when-rule-creates-new-file

JIRA: FUEL-236

Change-Id: I9c6521a382917822ce930ddf76391c5f3c3a9cb7
Signed-off-by: Matei Valeanu <Matei.Valeanu@enea.com>
7 years agoDouble allocated memory of fuel master node 99/32999/1
Michael Polenchuk [Wed, 5 Apr 2017 09:50:44 +0000 (13:50 +0400)]
Double allocated memory of fuel master node

Rise up allocated memory of fuel master node for virtual envs in order
to avoid swapping and improve performance of overall deployment process.

Change-Id: I04b020b628a9c84f934a9d17e8be98d34fe2a085
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years agoUpdate Host OS NTP Servers to pool.ntp.org 79/32779/1
Catalina Focsa [Fri, 31 Mar 2017 12:02:45 +0000 (14:02 +0200)]
Update Host OS NTP Servers to pool.ntp.org

Old *.fuel.pool.ntp.org values are no longer accessible

Change-Id: I0879dbd6a262491b4dc9f24d77fb87a007cbaec8
Signed-off-by: Catalina Focsa <catalina.focsa@enea.com>
7 years agoRevert "Revert: Blueprint "bp/distributed-serialization"" 97/31997/1
Michael Polenchuk [Tue, 28 Mar 2017 07:21:54 +0000 (07:21 +0000)]
Revert "Revert: Blueprint "bp/distributed-serialization""

This reverts commit 8b28c44a4be6beef8a71e672f543001bcc0a080f.
The issue has been fixed in upstream.

Change-Id: Id4ad8fb7b1ec887f8d8d1d5b18a9b33a73bda10c
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years agoRevert: Blueprint "bp/distributed-serialization" 99/31799/1
Alexandru Avadanii [Sun, 26 Mar 2017 17:18:52 +0000 (19:18 +0200)]
Revert: Blueprint "bp/distributed-serialization"

Until upstream fixes bug [1], partially revert blueprint
implementation [2]:
- fuel-agent: no-op, we overwrite fuel_bootstrap_cli.yaml anyway;
- fuel-library: no-op, keep newly added port config in place;
- fuel-web: revert all blueprint related changes;

NOTE: When this blueprint becomes part of Fuel@OPNFV, we need to
      update our "fuel_bootstrap_cli.yaml".

[1] https://bugs.launchpad.net/fuel/+bug/1676197
[2] https://review.openstack.org/#/q/topic:bp/
    distributed-serialization+status:merged+branch:stable/newton

JIRA: FUEL-265

Change-Id: Icf392a3446e5c89c2592d1733bc1f3401b7d69ad
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
7 years agoLog delete environment issue 39/31339/1
Michael Polenchuk [Wed, 22 Mar 2017 08:36:20 +0000 (12:36 +0400)]
Log delete environment issue

Log delete environment issue instead of fail with it since
it ain't severe operation to break down whole deployment process.

Change-Id: Ibbdf41a1323970068c09efcd1355f95f030ef1e6
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years ago[kvm-plugin] Update the kernel version 51/31251/1
Michael Polenchuk [Tue, 21 Mar 2017 18:22:54 +0000 (22:22 +0400)]
[kvm-plugin] Update the kernel version

Change-Id: Ieeb773e4801073caf50e5b795054aab64d3c7009
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years agoExtend error messages list 49/31049/1
Michael Polenchuk [Mon, 20 Mar 2017 13:39:41 +0000 (17:39 +0400)]
Extend error messages list

Start redeploy if errors for the following bugs are caught:
https://bugs.launchpad.net/fuel/+bug/1673797
https://bugs.launchpad.net/fuel/+bug/1672683

Change-Id: I41bc10d983f193e4206f0913358f5710f034070a
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years agoMerge "Update for fuel10 onos plugin"
Alexandru Avadanii [Mon, 20 Mar 2017 13:08:10 +0000 (13:08 +0000)]
Merge "Update for fuel10 onos plugin"

7 years agoMerge "[kvm-plugin] Rename node_reboot task"
Alexandru Avadanii [Mon, 20 Mar 2017 12:32:03 +0000 (12:32 +0000)]
Merge "[kvm-plugin] Rename node_reboot task"

7 years agoRevert "[kvm/dpdk] Switch vlan mode to vxlan" 91/30991/2
Michael Polenchuk [Mon, 20 Mar 2017 07:36:24 +0000 (07:36 +0000)]
Revert "[kvm/dpdk] Switch vlan mode to vxlan"

This reverts commit b8584eeb13c75d7f20a4582d287ab7ac1d52f0af.
vxlan mode has broken in upstream:
https://bugs.launchpad.net/fuel/+bug/1673767

Change-Id: I71fabf1c74f419ab1f6d5d04a294be98fa927ef3
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years ago[kvm-plugin] Rename node_reboot task 89/30989/1
Michael Polenchuk [Mon, 20 Mar 2017 07:32:07 +0000 (11:32 +0400)]
[kvm-plugin] Rename node_reboot task

Change-Id: I5251f209c74613d8b4683f1923166513762cd526
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years agoUpdate for fuel10 onos plugin 49/30649/3
rssaravana [Thu, 16 Mar 2017 06:17:50 +0000 (11:47 +0530)]
Update for fuel10 onos plugin

Change-Id: Ie7e9b5c16505223616bc6d796ce8de60236d098c
Signed-off-by: rssaravana <saravanakumar.somaskandan@huawei.com>
7 years agoMerge "f_repos: Set git patch format explicitly"
Alexandru Avadanii [Fri, 17 Mar 2017 16:42:51 +0000 (16:42 +0000)]
Merge "f_repos: Set git patch format explicitly"

7 years agof_tacker-pluginbuild: Force cache ID change 51/30851/2
Alexandru Avadanii [Fri, 17 Mar 2017 16:14:48 +0000 (17:14 +0100)]
f_tacker-pluginbuild: Force cache ID change

This will force a rebuild of Tacker plugin, to bypass poisoned
cache.

Change-Id: I77a028d56cc6202f799c7c0af3b688674256106c
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
7 years agoRevert "Increase tcp_retries2 value" 41/30841/2
Michael Polenchuk [Fri, 17 Mar 2017 14:44:20 +0000 (18:44 +0400)]
Revert "Increase tcp_retries2 value"

This reverts commit 0b313e2c089d296232a9a7ca43e9f37d514400a0.
This patch has been merged into upstream.

Change-Id: I15ba6f161547b7fd928c4ed54f8a9eef58046e48
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years agoCatch nodes flapping issue 05/30805/2
Michael Polenchuk [Fri, 17 Mar 2017 10:24:28 +0000 (14:24 +0400)]
Catch nodes flapping issue

Wait for nodes to become online to row down the bug
https://bugs.launchpad.net/fuel/+bug/1672969

Change-Id: Ic0621a415461c1552ebfc9cd7d1ab2061ea7a8cb
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years agof_repos: Set git patch format explicitly 07/30607/1
Alexandru Avadanii [Wed, 15 Mar 2017 23:20:01 +0000 (00:20 +0100)]
f_repos: Set git patch format explicitly

Skip patch format auto-detection, by setting it explicitly to "mbox".
This allows adding license headers to patch files.

JIRA: ARMBAND-236

Change-Id: I2b19ced80984ea98e220935c9d36836e62203bb7
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
7 years agoMerge "Rebase yardstick to stable/danube"
Ruijing Guo [Wed, 15 Mar 2017 13:00:53 +0000 (13:00 +0000)]
Merge "Rebase yardstick to stable/danube"

7 years agoMerge "Rebase vsperf to stable/danube"
Ruijing Guo [Wed, 15 Mar 2017 13:00:43 +0000 (13:00 +0000)]
Merge "Rebase vsperf to stable/danube"

7 years agoRebase yardstick to stable/danube 57/30557/1
Guo Ruijing [Wed, 15 Mar 2017 03:14:51 +0000 (11:14 +0800)]
Rebase yardstick to stable/danube

Change-Id: I8d284e92608d3fa89cbbe97ccb32536f3a9fae37
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
7 years agoRebase vsperf to stable/danube 73/30373/2
Guo Ruijing [Mon, 13 Mar 2017 19:59:37 +0000 (12:59 -0700)]
Rebase vsperf to stable/danube

Change-Id: I621d45c2db74ca3a030f15e29e167a890560ee2d
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
7 years agoMerge "Rebase barometer to stable/danube"
Ruijing Guo [Wed, 15 Mar 2017 02:55:47 +0000 (02:55 +0000)]
Merge "Rebase barometer to stable/danube"

7 years agoRebase barometer to stable/danube 89/30489/1
Guo Ruijing [Tue, 14 Mar 2017 17:15:51 +0000 (01:15 +0800)]
Rebase barometer to stable/danube

Change-Id: I5c550d8919a9b2147745caa0c7302f55291ca437
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
7 years agoRebase to fuel ovs plugin stable/10.0 87/30487/1
Guo Ruijing [Tue, 14 Mar 2017 17:10:33 +0000 (01:10 +0800)]
Rebase to fuel ovs plugin stable/10.0

Change-Id: Ib1cce4ca265ec8716272597aeff97d8195276e61
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
7 years agoMerge "docs: Adding Labels"
Alexandru Avadanii [Fri, 10 Mar 2017 18:12:59 +0000 (18:12 +0000)]
Merge "docs: Adding Labels"

7 years agodocs: Adding Labels 37/29937/2
ShubhamRathi [Tue, 7 Mar 2017 11:40:27 +0000 (17:10 +0530)]
docs: Adding Labels

Labels serve as anchors/ refs when referenced from other documents
This patch adds labels to docs/*/*/index.rst

Change-Id: I50572f9300e4be91e5fd35b96383d9075b229be2
Signed-off-by: ShubhamRathi <shubhamiiitbackup@gmail.com>
7 years agoUpdate to get the latest bug fix in ODL plugin 71/30071/1
“Manuel Buil” [Wed, 8 Mar 2017 15:56:17 +0000 (16:56 +0100)]
Update to get the latest bug fix in ODL plugin

https://review.openstack.org/#/q/32b7edbde866b6a4c1c61e674ddf01a93dd010a2

Change-Id: I9b943bd1fd47f98d9bab9eef23faf6f01650f929
Signed-off-by: “Manuel Buil” <mbuil@suse.com>
7 years agoEnable experimental features by default 09/29709/1
Michael Polenchuk [Fri, 3 Mar 2017 08:30:28 +0000 (12:30 +0400)]
Enable experimental features by default

JIRA: FUEL-260
Change-Id: I2235a876ffd8a403548b380fe28b62c67b0b43ea
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years agoRevert "Select the fastest mirror of repos" 43/29643/1
Michael Polenchuk [Thu, 2 Mar 2017 13:10:30 +0000 (13:10 +0000)]
Revert "Select the fastest mirror of repos"

This reverts commit fc94d23c7780bab8d14ecf7f04603c2c1d4aa7d3.
Since connectivity_tests doesn't support "mirror" method.

Change-Id: I1fa0a8fafbce0dec271fed67b3599efd40d5cac0
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years agoSelect the fastest mirror of repos 21/29621/1
Michael Polenchuk [Thu, 2 Mar 2017 08:40:16 +0000 (12:40 +0400)]
Select the fastest mirror of repos

apt-get supports a "mirror" method that will automatically
select a closest mirror based on geographical location.

Change-Id: I15d345de759e616a705abcdec3588ea4b9409d0a
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years agoUpdate documentation for Danube 07/29507/2
Serg Melikyan [Wed, 1 Mar 2017 01:01:03 +0000 (17:01 -0800)]
Update documentation for Danube

Change-Id: I535eb87bfa980cffc8e091b896b505884ed12d32
Signed-off-by: Serg Melikyan <smelikyan@mirantis.com>
7 years agopatch-packages: Disable mechanism once again 59/29459/1
Alexandru Avadanii [Tue, 28 Feb 2017 00:16:17 +0000 (01:16 +0100)]
patch-packages: Disable mechanism once again

Now that cirros-testvm DEB patching is no longer needed, disable
patch-pacakges mechanism. This saves a few minutes from each build.

Change-Id: I2e0c8f86a5fda55cb57a3d08a3f585cb535eb2f4
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
7 years agoMerge "Tidy up outdated cirros image"
Alexandru Avadanii [Mon, 27 Feb 2017 23:43:01 +0000 (23:43 +0000)]
Merge "Tidy up outdated cirros image"

7 years agoBump sfc scenario to ODL 5.2.0-1 41/29341/3
George Paraskevopoulos [Fri, 24 Feb 2017 08:30:53 +0000 (10:30 +0200)]
Bump sfc scenario to ODL 5.2.0-1

This might be related to the instances not getting an IP from DHCP
problem in the CI.
(https://build.opnfv.org/ci/view/functest/job/functest-fuel-baremetal-daily-master/1166/console)

In any case we run the tests using 5.2.0.1 in our pods so we should use
this as well in Jenkins.

Change-Id: Iab424ea4b55d0abb80e6b6a368dfb78046487ec9
Signed-off-by: George Paraskevopoulos <geopar@intracom-telecom.com>
7 years agoBump fuel-plugin-odl to include Zrpcd/Quaggga 97/29297/1
Romanos Skiadas [Thu, 23 Feb 2017 16:51:23 +0000 (18:51 +0200)]
Bump fuel-plugin-odl to include Zrpcd/Quaggga

Change-Id: I5e2a4bd247fbac9e8518310f8140e12377e7da7e
Signed-off-by: Romanos Skiadas <rski@intracom-telecom.com>
7 years agoTidy up outdated cirros image 23/29223/1
Michael Polenchuk [Wed, 22 Feb 2017 13:17:57 +0000 (17:17 +0400)]
Tidy up outdated cirros image

Remove outdated daily build of cirros image since version of
0.3.5 has been released and supposed to use by functest suites.

Change-Id: If8b7dd86a284485b376ec0f62f43093e674c96a3
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years agof_repos: fuel-library: Sync patch w/ upstream 79/29179/1
Alexandru Avadanii [Tue, 21 Feb 2017 23:12:48 +0000 (00:12 +0100)]
f_repos: fuel-library: Sync patch w/ upstream

Adjust patch context after upstream changes merged recently.

Change-Id: I341186055e3a77620028ae1bab9cd69c70f87014
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
7 years ago[kvm/dpdk] Switch vlan mode to vxlan 41/29141/1
Michael Polenchuk [Tue, 21 Feb 2017 12:12:27 +0000 (16:12 +0400)]
[kvm/dpdk] Switch vlan mode to vxlan

On hardware labs the packets doesn't egress from dpdk
enabled interface in vlan mode with custom kernel on board.
Therefore use vxlan mode instead of vlan for these scenarios.

Change-Id: If4b5719a5e58a9298aa0aeeaf1942d05774fba7a
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years agoMerge "[kvm-plugin] Employ dedicated reboot task"
Alexandru Avadanii [Fri, 17 Feb 2017 14:43:00 +0000 (14:43 +0000)]
Merge "[kvm-plugin] Employ dedicated reboot task"

7 years agoMerge "[barometer] Mend scenarios to get all the plugins"
Alexandru Avadanii [Fri, 17 Feb 2017 14:42:06 +0000 (14:42 +0000)]
Merge "[barometer] Mend scenarios to get all the plugins"

7 years agoMerge "KVMFORNFV: Updating the copyright information for kvmfornfv scenarios."
Alexandru Avadanii [Fri, 17 Feb 2017 12:01:15 +0000 (12:01 +0000)]
Merge "KVMFORNFV: Updating the copyright information for kvmfornfv scenarios."

7 years ago[barometer] Mend scenarios to get all the plugins 31/28931/1
Michael Polenchuk [Fri, 17 Feb 2017 10:47:02 +0000 (14:47 +0400)]
[barometer] Mend scenarios to get all the plugins

Due to double section of stack-extensions the plugins are
activated only from last one losing required plugin of kvm.

Change-Id: I57aa6dbcef1a43dbfd8f472e7cabf1a2c2e5fc26
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years ago[kvm-plugin] Employ dedicated reboot task 25/28925/1
Michael Polenchuk [Fri, 17 Feb 2017 09:56:21 +0000 (13:56 +0400)]
[kvm-plugin] Employ dedicated reboot task

* Use native reboot task after kernel setup.
* Make dkms modules to get source files of the kernel.

JIRA: FUEL-256
Change-Id: I1dd75fa0425e5080fafa2de0ef13cccf0090c4c9
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years agoMerge "Sync os_workers fact with upstream"
Alexandru Avadanii [Fri, 17 Feb 2017 02:44:01 +0000 (02:44 +0000)]
Merge "Sync os_workers fact with upstream"

7 years agoKVMFORNFV: Updating the copyright information for kvmfornfv 97/28797/2
Navya [Thu, 16 Feb 2017 09:45:35 +0000 (15:15 +0530)]
KVMFORNFV: Updating the copyright information for kvmfornfv
scenarios.

This patch includes the copyright information for kvmfornfv
os-nosdn-kvm_ovs_dpdk-ha, os-nosdn-kvm_ovs_dpdk-noha and
os-nosdn-kvm_ovs_dpdk_bar-ha scenarios.

Change-Id: I570f465b01e128de980be9cb695e394ec21a73af
Signed-off-by: Navya Bathula <navyax.bathula@intel.com>
7 years agoSync os_workers fact with upstream 07/28807/1
Michael Polenchuk [Thu, 16 Feb 2017 11:07:57 +0000 (15:07 +0400)]
Sync os_workers fact with upstream

The current value for os_workers performs 3x worse in many cases compared
to the prevuous default of processorcount. Let's tune value to provide
response times close to what processorcount had (with 2 sockets machines).

Change-Id: Icecbaa18015e7fb9f5762222d69334bdf1a7566a
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years agoKVMFORNFV: Implementing kvmfornfv scenarios. 79/28779/2
Navya [Thu, 16 Feb 2017 05:29:54 +0000 (10:59 +0530)]
KVMFORNFV: Implementing kvmfornfv scenarios.

This patch includes implementation of kvmfornfv
os-nosdn-kvm_ovs_dpdk_bar-noha scenario.

Change-Id: I0049c065b4bb500a262d385e07eee7e71d6f475d
Signed-off-by: Navya Bathula <navyax.bathula@intel.com>
7 years agof_repos: patch: Rebase patches, cleanup 63/28763/1
Alexandru Avadanii [Wed, 15 Feb 2017 22:53:42 +0000 (23:53 +0100)]
f_repos: patch: Rebase patches, cleanup

While at it, re-export patches to remove any redundant info:
$ make patches-export

Change-Id: I4ce3aba9f9d6092bade305a744738c44a936db7c
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
7 years agoMerge "Increase tcp_retries2 value"
Alexandru Avadanii [Wed, 15 Feb 2017 15:49:53 +0000 (15:49 +0000)]
Merge "Increase tcp_retries2 value"

7 years agoRemove OVS with DPDK 59/28659/3
Guo Ruijing [Tue, 14 Feb 2017 17:48:49 +0000 (09:48 -0800)]
Remove OVS with DPDK

Change-Id: I0191f7c950848c2175851e2e41dc0f7a68b85606
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
7 years agopatch: fuel-main: Adjust context to match upstream 61/28661/1
Alexandru Avadanii [Wed, 15 Feb 2017 02:13:57 +0000 (03:13 +0100)]
patch: fuel-main: Adjust context to match upstream

Change-Id: I532567f0d48ceb84eb1e3afedcd9b555eab51ac9
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
7 years agoIncrease tcp_retries2 value 85/28585/1
Michael Polenchuk [Tue, 14 Feb 2017 07:47:53 +0000 (11:47 +0400)]
Increase tcp_retries2 value

Change-Id: I7a01c1b56c3602eb67fc4e1aeaeb1dbd6772841a
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years agoRemove vlan id range from scenarios 85/28285/1
Michael Polenchuk [Wed, 8 Feb 2017 13:28:03 +0000 (17:28 +0400)]
Remove vlan id range from scenarios

Since scenarios vlan_range config has precedence,
so it doesn't matter that is in dea pod override file of the labs.
Let's define/get actual vlan id range in/from lab specific configs.

Change-Id: Iba329ae94c6f5a2e3bf046b4838d5a2c3d49bf5e
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years ago[odl] Mend standalone mode condition 67/28267/1
Michael Polenchuk [Wed, 8 Feb 2017 07:26:36 +0000 (11:26 +0400)]
[odl] Mend standalone mode condition

Change-Id: If51ee19a0cd0cb0a83dcf40fda46d0aaa817408e
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years agoMerge "KVMFORNFV: Implementing kvmfornfv Scenarios."
Alexandru Avadanii [Tue, 7 Feb 2017 08:32:32 +0000 (08:32 +0000)]
Merge "KVMFORNFV: Implementing kvmfornfv Scenarios."

7 years ago[odl] Skip creating non-existing resources 21/28121/1
Michael Polenchuk [Mon, 6 Feb 2017 14:07:30 +0000 (18:07 +0400)]
[odl] Skip creating non-existing resources

Change-Id: I1321b04f5789dfad042befe4b20b5b4ce3f3fb92
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years agoKVMFORNFV: Implementing kvmfornfv Scenarios. 89/28089/3
kalyanreddy [Mon, 6 Feb 2017 07:03:36 +0000 (12:33 +0530)]
KVMFORNFV: Implementing kvmfornfv Scenarios.

This patch includes implementation of kvmfornfv
os-nosdn-kvm_ovs_dpdk_bar-ha scenario and required
barometer plugin configuration file.

Change-Id: I1a76002be4581b8d777fb533dde8c03fe001f0cf
Co-Authored-By: Navya <b.navya4@tcs.com>
Signed-off-by: Gundarapu Kalyan Reddy <reddyx.gundarapu@intel.com>
7 years agoMerge "barometer: remove RDT from fuel plugin"
Alexandru Avadanii [Sat, 4 Feb 2017 15:37:06 +0000 (15:37 +0000)]
Merge "barometer: remove RDT from fuel plugin"

7 years agof_tacker-pluginbuild: Bump auth url version 37/28037/1
Alexandru Avadanii [Sat, 4 Feb 2017 15:03:37 +0000 (16:03 +0100)]
f_tacker-pluginbuild: Bump auth url version

Use keystone v3 for authentication instead of v2.0

Change-Id: I8c1938ba86dea1d8ab1e4c0436c87f62b2763c95
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
7 years agobarometer: remove RDT from fuel plugin 09/28009/1
Maryam Tahhan [Fri, 3 Feb 2017 19:45:06 +0000 (19:45 +0000)]
barometer: remove RDT from fuel plugin

Remove buggy RDT plugin.

Change-Id: Iabd1d1f0777251101aa25c9f6ee7628b57a6ea7c
Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
7 years agof_odlpluginbuild: Force .cacheid change 43/27943/2
Alexandru Avadanii [Thu, 2 Feb 2017 19:58:21 +0000 (20:58 +0100)]
f_odlpluginbuild: Force .cacheid change

Recent builds use a stale cache of the ODL plugin artifact,
which leads to deploy failures (old Fuel plugin builder was used
to generate that artifact, which did not support multiple DEB
versions, silently excluding the default [5.0.0] version of ODL).

Chasing down the artifact across all build servers requires
extensive work, so we can just force a change in the cache id.

While at it, cleanup non-rebase plugin list (aesthetics).

Change-Id: I174f102f58f83ce6370def6a3de166e0911ff411
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
7 years agoEnable fuel plugin of tacker 99/27899/1
Michael Polenchuk [Thu, 2 Feb 2017 12:55:35 +0000 (16:55 +0400)]
Enable fuel plugin of tacker

Change-Id: I172d4d0948559200b8f9e6fbe91159b80ab734ba
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years agoMerge "f_repobuild: Temporary: Use public mirrors in CI"
Alexandru Avadanii [Thu, 2 Feb 2017 11:17:35 +0000 (11:17 +0000)]
Merge "f_repobuild: Temporary: Use public mirrors in CI"

7 years agoMerge "Update bgpvpn scenarios to version 1.0.0"
Alexandru Avadanii [Thu, 2 Feb 2017 10:56:05 +0000 (10:56 +0000)]
Merge "Update bgpvpn scenarios to version 1.0.0"

7 years agof_repobuild: Temporary: Use public mirrors in CI 85/27885/1
Alexandru Avadanii [Thu, 2 Feb 2017 10:49:14 +0000 (11:49 +0100)]
f_repobuild: Temporary: Use public mirrors in CI

Offline mirrors need a second look before they can be used alone,
i.e. without the public mirrors.

Until we sort out all offline mirror issues, add public ones too.

JIRA: FUEL-250

Change-Id: I18700f10b6fa49b541ad7bda085bc7a64f80d992
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
7 years agoUpdate bgpvpn scenarios to version 1.0.0 41/27841/2
Michael Polenchuk [Wed, 1 Feb 2017 11:11:01 +0000 (15:11 +0400)]
Update bgpvpn scenarios to version 1.0.0

Change-Id: I22cab1507a2eee5613dee2a473ed07d22ffdaacf
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
7 years agof_repobuild: Add postfix package explicitly 69/27869/1
Alexandru Avadanii [Wed, 1 Feb 2017 22:15:48 +0000 (23:15 +0100)]
f_repobuild: Add postfix package explicitly

Packetary automatically solves for Fuel@OPNFV:
- base pkgs and their deps;
- bootstrap/target image additional pkgs;
- explicit reqs;

However, corner cases like "postfix", which is not in any of the
above categories - being installed via puppet only, need to be
added to the explicit list.

JIRA: FUEL-250

Change-Id: I21f4c295a59426af26035d18be548a39a9e78851
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
7 years agoMerge "f_repobuild: Use packetary to build partial mirror"
Alexandru Avadanii [Wed, 1 Feb 2017 10:16:41 +0000 (10:16 +0000)]
Merge "f_repobuild: Use packetary to build partial mirror"

7 years agoEnable bgpvpn plugin build and bump repo 43/27743/5
Nikolas Hermanns [Mon, 30 Jan 2017 13:44:08 +0000 (14:44 +0100)]
Enable bgpvpn plugin build and bump repo

Change-Id: I298868aedf55c560194556bf6680289ae73a5113
Signed-off-by: Nikolas Hermanns <nikolas.hermanns@ericsson.com>
Signed-off-by: Romanos Skiadas <rski@intracom-telecom.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
7 years agoGet latest version of plugin builder 69/27769/1
Michael Polenchuk [Tue, 31 Jan 2017 07:40:01 +0000 (11:40 +0400)]
Get latest version of plugin builder

JIRA: INFRA-74
Change-Id: I91fa669afb7cc4849bb82fcb80a027d3ae3636f5
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years agof_repobuild: Use packetary to build partial mirror 99/23999/19
Alexandru Avadanii [Wed, 6 Jul 2016 15:03:49 +0000 (17:03 +0200)]
f_repobuild: Use packetary to build partial mirror

Packetary [1] will replace fuel-mirror in upstream Fuel.
fuel-mirror is using packetary under the hood already, so the
transition should not be too hard.

Adapt OPNFV Ubuntu partial mirror build:
- obsolete opnfv-config.yaml (packetary uses CLI args for this);
- new opnfv_config.yaml will hold old ubuntu.yaml data, split at
  build runtime into:
  * mos_<arch>_mirror.yaml - MOS mirror cfg, only for deps analysis;
  * ubuntu_<arch>_mirror.yaml - Ubuntu mirror cfg, for pkgs download;
  * ubuntu_<arch>_packages.yaml - Ubuntu packages to download;

While the consumers of our mirror still use `debootstrap`, which only
supports the "main" repo component, make sure the "main" package set
is complete, in the scope of:
  * ubuntu_<arch>_mirror_main.yaml - Ubuntu [main only] mirror;
  * ubuntu_<arch>_packages_main.yaml - Ubuntu packages for [main];

New workflow (executed for EACH architecture):
1. Collect bootstrap package deps from <fuel_bootstrap_cli.yaml>;
2. Collect all fixture release pkgs from fuel-web's <openstack.yaml>;
3. Add OPNFV extra pkg deps from "opnfv_config.yaml"
   (based on old fuel-mirror)

   Currently, this is based on old fuel-mirror's
   <fuel-mirror/contrib/fuel_mirror/data/ubuntu.yaml>, holding a
   hardcoded list of package deps; plus eventual extra OPNFV packages,
   like additional kernels, bootloaders etc.
   Since we now inspect MOS repos for deps with packetary, this old
   list should be easy to throw away as soon as we confirm each item
   is directly required by another, already existing package in the
   mirror. For now, keep the old list as safety net for missing deps.

   NOTE: Dependencies up to and including this group should also
   be satisfiable from Ubuntu "main" repo component only.

4. Append plugin dependencies to the package list;

5. Run `packetary unresolved` for MOS repos, gathering MOS deps that
   should be fetched from Ubuntu. The new packages will be appended
   to the predefined list from old "ubuntu.yaml";

6. Run `packetary clone` to download all required pkgs for the
   partial Ubuntu mirror.

7. IF repo component merging is disabled, run `packetary clone` only
   on Ubuntu[main] repo components to download any (still) missing
   dependencies for `debootstrap`, which only looks at this component,
   and not the whole mirror.

8. IF repo component merging is enabled, run first `dpkg-scanpackages`
   to filter out old duplicate versions of packages, then run
   `packetary create` to merge all repo comps into a single "main".

v1 -> v2:
- multiarch support (activated via UBUNTU_ARCH envvar);
- fixed debootstrap missing deps in "main" component of Ubuntu mirror;
- factored out some hardcodes into variables/functions;
- add .gitignore file;
- move generated config files to "opnfv_config" subdir;
- add arm64 Ubuntu repo URL (ports.ubuntu.com is separated from the
  main Ubuntu mirror, archive.ubuntu.com, which only holds x86 pkgs);

v3 -> v4:
- introduce env var "MIRROR_UBUNTU_MERGE" to control local mirror
  repo-component merging into a single "main";
- enable mirror repo-component merging by default, edit
  fuel_bootstrap_cli.yaml accordingly;

v4 -> v6:
- edit dea_base to use only main mirror;
- fix duplicated logs;
- remove `-q` flag for `create`;

v6 -> v7:
- rebase for Newton fuel_bootstrap_cli.yaml (s/trusty/xenial/);
- include OPNFV plugin deps in local Ubuntu mirror;
- add `vgabios` dependency, required for arm64 guest firmware;
- remove all fuel-mirror references;
- merge old fuel-mirror pkglist to OPNFV pkglist;
- update packetary commit to include upstream bugfixes [2, 3];

v7 -> v11:
- re-enable f_repobuild after Newton rebase;
- fix leftover "trusty" ref to "xenial";
- force f_repobuild rebuild to bypass cache (by editing Makefile);
- extend f_repobuild .cacheid to include scripts and OPNFV config;

v11 -> v12:
- fix install/install.sh old refs to "trusty";
- fix out of date select_ubuntu_repo.s refs to "trusty";

v12 -> v16:
- fix leftover mos9.0 / fuel-mirror references;
- fix most issues reported by `pylint opnfv_mirror_ubuntu.py`;

v16 -> v18:
- Sync fuel_bootstrap_cli.yaml with settings.yaml.sample from 10.0:
  [4] Stub pass for "Get root password for build image from settings"
  [5] Sync pkg list with "Switch to Ubuntu Xenial"
  [6] "Add puppet and daemonize to default packages list"
  [7] "Delete kernel debug related parameter for performance"
  [8] "Add to bootstrap image dependencies for network checker"
- Remove obsolete Trusty kernel images from pkg lists;
- Don't break when plugins set is empty;
- Fix missing "vim" package, which was resolved using secondary
  provider packages like GUI-enabled vim flavors;
  The proposed fix is quite sensitive, also cutting the final
  mirror size in half (!), and allowing us to remove a previous
  hacky workaround (re-running packetary only for main).
- Remove "main"-only packetary run (hacky), since the new fix for "vim"
  also takes care of packetary solving dependencies from "universe".
- Add OPNFV blacklisting to workaround "upstart" package being installed,
  together with "systemd" (having them both installed confuses puppet);
- Currently in testing in Armband as part of [9]:
  * bootstrap and target image building works from offline mirror;
  * systemd is used instead of upstart;
  * full deploy is not yet confirmed, due to some AArch64 specifics we
    are in the process of fixing;

NOTE: Without filtering out old package verisons using
`dpkg-scanpackages`, bootstrap build cannot solve all deps.

FIXME: Repo component merging is sort of slow, since packetary insists
on copying the source files to the destination dir even if they are
pointing to the same repo.

FIXME: Packetary `create` uses a different directory scheme for the
created mirror than the upstream Ubuntu, e.g.:
[p] mirrors/ubuntu/pool/main/l/lvm2_2.02.98-6ubuntu2_amd64.deb
[U] mirrors/ubuntu/pool/main/l/lvm2/lvm2_2.02.98-6ubuntu2_amd64.deb

This disencourages creating the "merged" mirror in the same location
as the source partial mirror.

[1] https://wiki.openstack.org/wiki/Packetary
[2] https://review.openstack.org/#/c/392936/
[3] https://review.openstack.org/#/c/392937/
[4] https://review.openstack.org/#/c/277353/
[5] https://review.openstack.org/#/c/345516/
[6] https://review.openstack.org/#/c/344909/
[7] https://review.openstack.org/#/c/400165/
[8] https://review.openstack.org/#/c/415912/
[9] https://gerrit.opnfv.org/gerrit/#/c/26157/
[10] https://review.openstack.org/#/c/420815

JIRA: FUEL-218
JIRA: FUEL-223
JIRA: ARMBAND-169
JIRA: ARMBAND-185

Change-Id: If2ee86f348b7683c83bfaf686baba4f1b8f555f0
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
7 years agoUplift OpenDaylight plugin to Fuel 10 65/25565/6
Michal Skalski [Wed, 7 Dec 2016 00:36:41 +0000 (01:36 +0100)]
Uplift OpenDaylight plugin to Fuel 10

Currently only update pure odl scenarios because both sfc and bgpvpn
variants require additional plugins.

JIRA: FUEL-224
JIRA: FUEL-222

Change-Id: I9891029d3f6a4b6b124cca13caceaab6edb6ca6a
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
7 years agoMerge "Upload interfaces config before attributes"
Alexandru Avadanii [Wed, 25 Jan 2017 11:37:06 +0000 (11:37 +0000)]
Merge "Upload interfaces config before attributes"

7 years agoUpdate barometer plugin 29/27429/1
Guo Ruijing [Mon, 23 Jan 2017 17:35:12 +0000 (12:35 -0500)]
Update barometer plugin

1. add feature attributes in plugin
2. update collectd
3. enable mcelog, hugepages, ovs events

Change-Id: Ib9da6c3a6ec2d6ded0f212b1b298a0ed9a355c69
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
7 years agoUpload interfaces config before attributes 77/27377/1
Michael Polenchuk [Mon, 23 Jan 2017 11:24:03 +0000 (15:24 +0400)]
Upload interfaces config before attributes

Enable dpdk on an interface before upload specific settings
in order to meet the validator requirements.

JIRA: FUEL-247
Change-Id: Id1248b391257b07b26edb5630da47f4dcbafb156
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>