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>
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>
Alexandru Avadanii [Wed, 25 Jan 2017 11:37:06 +0000 (11:37 +0000)]
Merge "Upload interfaces config before attributes"
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>
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>
Michael Polenchuk [Fri, 13 Jan 2017 11:27:51 +0000 (15:27 +0400)]
Align hugepages size with dpdk reqirements
Since the minimum value of dpdk hugepages has been changed,
increase requested hugepages size (256Mb for virtual,
1024Mb for baremetal labs).
JIRA: FUEL-244
Change-Id: I5a46dc17e5ef67bbdc8fc8824efb3453217da214
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Fedor Zhadaev [Tue, 17 Jan 2017 08:29:41 +0000 (08:29 +0000)]
Merge "KVMFORNFV: Implementing kvmfornfv Scenarios."
Fedor Zhadaev [Tue, 17 Jan 2017 08:22:55 +0000 (08:22 +0000)]
Merge "Enable dpdk property on interface"
Alexandru Avadanii [Mon, 16 Jan 2017 20:50:03 +0000 (20:50 +0000)]
Merge "build/Makefile: deepclean: make grep more strict"
Michael Polenchuk [Mon, 16 Jan 2017 19:33:51 +0000 (23:33 +0400)]
[congress] Mend database connection param
Change-Id: Ib338937c9e61c48dce2401f1ffc95e1e10c5c719
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Anders Roxell [Tue, 13 Dec 2016 17:35:18 +0000 (18:35 +0100)]
build/Makefile: deepclean: make grep more strict
Check if the docker image is named only 'ubuntu' and tag 14.04
JIRA: FUEL-245
Change-Id: I4dc58a295925cc64a1d5c52393e1c172d42f8a6e
Signed-off-by: Anders Roxell <anders.roxell@enea.com>
Michael Polenchuk [Fri, 13 Jan 2017 07:37:57 +0000 (11:37 +0400)]
Add congress plugin to build targets
Change-Id: I370f454880914b78609e0a8f778de4bee93a8553
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Fedor Zhadaev [Wed, 21 Dec 2016 14:03:52 +0000 (18:03 +0400)]
Add congress plugin to nosdn-nofeature scenarios
JIRA: FUEL-230
Change-Id: I20d4b38f876d5ee9bb7eeb0efb6a915f1de43bb9
Signed-off-by: Fedor Zhadaev <fzhadaev@mirantis.com>
Michael Polenchuk [Thu, 12 Jan 2017 09:06:54 +0000 (13:06 +0400)]
Enable dpdk property on interface
Set dpdk property in network attributes since
interface_properties have been removed in scope of
nics-and-nodes-attributes-via-plugin blueprint.
JIRA: FUEL-243
Change-Id: I7873d3a5c738d421f64237ff41d937856012d65a
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Fedor Zhadaev [Tue, 27 Dec 2016 08:18:25 +0000 (12:18 +0400)]
Build congress plugin as part ob building ISO
JIRA: FUEL-230
Change-Id: I315a9ed955cafa68a2454c30daac9dbf41f76e05
Signed-off-by: Fedor Zhadaev <fzhadaev@mirantis.com>
Ruijing Guo [Thu, 5 Jan 2017 04:57:21 +0000 (04:57 +0000)]
Merge "Enable ceilometer collectd"
Guo Ruijing [Mon, 2 Jan 2017 22:42:31 +0000 (14:42 -0800)]
Rebase to ovs 2.6.x and NSH
1. rebase to latest ovs without NSH
2. rebase to ovs 2.6.1 with NSH
Change-Id: I5481422e55fc65f48b78b4779119d9ff19868a91
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Edwin Zhai [Wed, 28 Dec 2016 22:24:15 +0000 (14:24 -0800)]
Minor fix for yardstick plugin
Fix installation dependency and authentication failure.
Change-Id: Ib15ecccaefd1e0214edd2e1d1f52ab3f9ed99f3a
Signed-off-by: Edwin Zhai <edwin.zhai@intel.com>
Alexandru Avadanii [Wed, 28 Dec 2016 04:40:34 +0000 (04:40 +0000)]
Merge "Rework processorcount limits to os_workers"
Guo Ruijing [Wed, 28 Dec 2016 01:04:42 +0000 (17:04 -0800)]
Enable ceilometer collectd
1. ceilometer collectd basic functionality can work
2. will update config.mk after review #26213 is merged
Change-Id: I3a115f20b176dbee93ce5d72c580c83d6b721382
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Alexandru Avadanii [Mon, 19 Dec 2016 20:45:17 +0000 (21:45 +0100)]
build: plugins: Allow plugin env var override
Newton uplift [1] silently disabled env var overrides for the
PLUGINS var, breaking Armband plugin selection.
Proposed fix: only set this var when not already set.
[1] https://gerrit.opnfv.org/gerrit/#/c/23433/
JIRA: ARMBAND-118
Change-Id: I143fc79de26cc9a3b66a177ca905984989bf4a9d
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Michael Polenchuk [Mon, 19 Dec 2016 14:28:31 +0000 (18:28 +0400)]
Rework processorcount limits to os_workers
JIRA: FUEL-227
Change-Id: I9186a1b0e0ef86c2efa322805c302f02c832e10f
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Alexandru Avadanii [Thu, 22 Dec 2016 12:37:58 +0000 (12:37 +0000)]
Merge "Reduce ceilometer memory usage"
Guo Ruijing [Tue, 20 Dec 2016 18:33:22 +0000 (10:33 -0800)]
Enable yardstick in D release
Change-Id: Ie9efd6a01b483e3e0797c19708cd1ca793f609d6
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Alexandru Avadanii [Tue, 20 Dec 2016 22:42:48 +0000 (22:42 +0000)]
Merge "build: select_ubuntu_repo: break on err"
Alexandru Avadanii [Tue, 20 Dec 2016 20:58:28 +0000 (20:58 +0000)]
Merge "Remove unused imports"
Alexandru Avadanii [Mon, 19 Dec 2016 23:49:47 +0000 (00:49 +0100)]
build: select_ubuntu_repo: break on err
Stop ISO build process if no sane Ubuntu mirrors are available,
instead of continuing with an empty URL, which is bound to fail
later.
While at it, skip re-assesing the output of select_ubuntu_repo.sh if
the URL var already is set.
Also, stderr and stdout were both captured in UBUNTU_MIRROR_URL,
so disable debug by default, and only print debug info in case no
valid mirror is found.
v2 -> v3:
- allow "One hour behind" mirror state to be considered, since
we already accept "Six hours behind" mirrors;
JIRA: FUEL-240
Change-Id: I791942da234304528ff5cae1891415602e1a62b2
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
kalyanreddy [Tue, 20 Dec 2016 09:35:09 +0000 (15:05 +0530)]
KVMFORNFV: Implementing kvmfornfv Scenarios.
This patch contains implementation of kvmfornfv
os-nosdn-kvm_ovs_dpdk-ha and os-nosdn-kvm_ovs_dpdk-noha scenarios by
enabling DPDK.
Change-Id: I9a57d7fdc6282f5446240c3129f4cc390d124515
Co-Authored-By: Navya <b.navya4@tcs.com>
Signed-off-by: Gundarapu Kalyan Reddy <reddyx.gundarapu@intel.com>
Michael Polenchuk [Thu, 8 Sep 2016 16:36:45 +0000 (19:36 +0300)]
Reduce ceilometer memory usage
JIRA: FUEL-227
Change-Id: Ia18064299da7c056cb247c2f7f350e5532f2f587
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Fri, 18 Nov 2016 10:07:34 +0000 (13:07 +0300)]
Add dkms package into initial pkgs list
OVS-plugin requires DKMS installed to operate on.
Also plugin yamls have been updated.
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Change-Id: I037b88fdf335e513d5f4e726c3daff9358397776
Fedor Zhadaev [Thu, 15 Dec 2016 10:47:48 +0000 (10:47 +0000)]
Merge "Restart sshd service instead of reload"
Michael Polenchuk [Tue, 13 Dec 2016 13:42:23 +0000 (17:42 +0400)]
Restart sshd service instead of reload
In the middle of fuel master node bootstrap the reload of sshd service
accidentally is losing main process pid, so restart it.
JIRA: FUEL-237
Change-Id: I89023177e71cb6da4b9d6beff5083d345cf66db8
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Alexandru Avadanii [Mon, 12 Dec 2016 19:06:52 +0000 (20:06 +0100)]
build: f_repos: Re-enable Armband specific patches
JIRA: ARMBAND-183
Change-Id: Ie43f8f9080241add1cb9d5312c774916baee0bee
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Fedor Zhadaev [Fri, 9 Dec 2016 05:31:12 +0000 (05:31 +0000)]
Merge "Turn kvm-plugin back on"
Michael Polenchuk [Thu, 8 Dec 2016 19:40:35 +0000 (23:40 +0400)]
Point to latest repos of fuel 10/newton
Since swarm tests have been enabled against 10.0
so get the latest repositories into build.
Change-Id: Ie24e51dbc2e80ef61dd9d892cd0083a594fd289e
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Fri, 18 Nov 2016 09:45:37 +0000 (12:45 +0300)]
Turn kvm-plugin back on
Change-Id: I7c46f263ec584b09b6022d9e961ae3c44c642954
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Ruijing Guo [Wed, 7 Dec 2016 07:47:44 +0000 (07:47 +0000)]
Merge "Enable vsperf in D release"
Michael Polenchuk [Mon, 5 Dec 2016 09:53:13 +0000 (13:53 +0400)]
Disable public ping_checker by default on CI
Change-Id: Ib0a24b7f0d5afa80bf7d05bf6fc035debb510a9e
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Guo Ruijing [Thu, 24 Nov 2016 03:36:54 +0000 (11:36 +0800)]
Enable vsperf in D release
Change-Id: Ibb5ed6a6d5dfb206388257367a66f5d758b2da9f
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Fedor Zhadaev [Wed, 30 Nov 2016 13:58:50 +0000 (16:58 +0300)]
Update documentation for Colorado 3.0
JIRA: FUEL-235
Change-Id: I6dd3a290179bd2b29e07dd0b72c2c007acd8682d
Signed-off-by: Fedor Zhadaev <fzhadaev@mirantis.com>
Alexandru Avadanii [Tue, 29 Nov 2016 16:30:18 +0000 (17:30 +0100)]
build/f_repos: Fix remote tracking, pin N HEADs
Fix two issues that went undetected until now:
- remote tracking variable does not properly evaluate in CI,
since there is no HEAD reference;
- git submodules references still point to master branch(es)
commits, although .gitmodules configure the remote tracked
branch correctly;
JIRA: FUEL-234
Change-Id: I96dc704e2cfe98f2e93d5fa7d7dd261e7f151238
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Michael Polenchuk [Tue, 29 Nov 2016 10:40:58 +0000 (13:40 +0300)]
Turn on remote tracking of submodules
JIRA: FUEL-234
Change-Id: I916cc94f58df2f2227384c73eda556f448ac50b5
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Peter Barabas [Tue, 22 Nov 2016 09:29:41 +0000 (10:29 +0100)]
Remove unused imports
Change-Id: Icb51f3fdec962c6f92e27e63b57bc30e8e6c75bb
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
Michael Polenchuk [Thu, 17 Nov 2016 13:59:35 +0000 (16:59 +0300)]
Turn ovs-plugin on
The ovs-plugin has been rebased to fuel 10/newton.
Change-Id: I23d9f33b005ec139862e4a53b70987706ae98198
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Wed, 16 Nov 2016 14:53:10 +0000 (17:53 +0300)]
Update dea_base with newton version
Change-Id: I08c2be408af19df648f3538bfb1948f6ddae0180
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Stefan Berg [Wed, 16 Nov 2016 08:40:40 +0000 (08:40 +0000)]
Merge "Uplift to Fuel 10.0/Newton"
Stefan K. Berg [Wed, 12 Oct 2016 14:42:35 +0000 (16:42 +0200)]
Uplift to Fuel 10.0/Newton
Build working, automated deploy working (simple test cases only).
All plugins disabled, so is the generation of the local ISO cache.
Both need to be re-enabled after merge of this uplift.
All patches wiped, pertinent ones need to be re-enabled after the
merge of this uplift.
Change-Id: I978a3d4ed25a45a4b88a6e35693baac597b162c2
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Peter Barabas [Thu, 10 Nov 2016 07:28:57 +0000 (08:28 +0100)]
Typo fixes
Change-Id: I189dd771f9985424694ca0164c6e42f117f12bf9
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
Michal Skalski [Fri, 4 Nov 2016 15:03:49 +0000 (16:03 +0100)]
Use networking-odl v1 instead of v2
Tests shows that networking-odl v2 introduce more problems when it comes
to propagate SG rules on ovs. Disable v2 for all scenarios.
See: https://bugs.opendaylight.org/show_bug.cgi?id=7021
JIRA: FUEL-216
Change-Id: I5440ba7ff81b2063491259d91f17cb5578a8c48c
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
Fedor Zhadaev [Wed, 2 Nov 2016 04:29:31 +0000 (04:29 +0000)]
Merge "[virtual envs] Switch to raw images"
Fedor Zhadaev [Tue, 1 Nov 2016 13:54:09 +0000 (13:54 +0000)]
Merge "Split out public_vip_ping task"
Michael Polenchuk [Tue, 1 Nov 2016 09:20:56 +0000 (12:20 +0300)]
[virtual envs] Switch to raw images
* use raw devices instead of qcow2
* disable i/o caching, it reduces data copies and bus traffic
* set native aio instead of thread based
JIRA: FUEL-201
Change-Id: I8ac728cbb5be5948080fab8ae4d3d311e0a5c09c
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Mon, 31 Oct 2016 10:32:25 +0000 (13:32 +0300)]
Split out public_vip_ping task
Split out public_vip_ping task to avoid race condition when ping_checker
resource might be started up on controllers before a primary one.
JIRA: FUEL-217
Change-Id: I3c11e8403d4e1c53a7f0eac07c71f59584882332
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Fedor Zhadaev [Tue, 18 Oct 2016 12:18:22 +0000 (15:18 +0300)]
Update documentation for Colorado 2.0
JIRA: FUEL-215
Change-Id: Ie922ff794e686e1824483a91a9571252adc2b1e2
Signed-off-by: Fedor Zhadaev <fzhadaev@mirantis.com>
Michael Polenchuk [Wed, 26 Oct 2016 12:40:16 +0000 (15:40 +0300)]
Shift public ping checker into deployment stage
Avoid public vip failover at the end of post-deployment
by moving ping_checker resource into deployment stage.
Also pingd constraint has been changed to be based on score.
If all the nodes failed to ping the default gw, the resource
ain't stopped and remains on the last node where it was.
JIRA: FUEL-212
JIRA: FUEL-217
Change-Id: I09329474cf13958499ac99bfbdf9c9055c9bcb55
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Jonas Bjurel [Thu, 27 Oct 2016 12:38:02 +0000 (12:38 +0000)]
Merge "Update cirros image"
Michael Polenchuk [Mon, 24 Oct 2016 08:19:33 +0000 (11:19 +0300)]
Align globals workers_max key limit
JIRA: FUEL-212
Change-Id: Ie8c50d515bffbb39deb44c32da42079b4181edd3
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Ruijing Guo [Mon, 24 Oct 2016 00:59:10 +0000 (00:59 +0000)]
Merge "[OVS] Update flavors key with large mem_page_size"
Michael Polenchuk [Tue, 18 Oct 2016 13:34:30 +0000 (16:34 +0300)]
[OVS] Update flavors key with large mem_page_size
Repoint to the "Update flavors mem_page_size"
from stable/9.0 branch of plugin.
Change-Id: I91d6a770faa9ee2d078b7f1ccccb7d61525ad923
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Thu, 29 Sep 2016 13:48:29 +0000 (16:48 +0300)]
Update cirros image
To properly handle source routing passing by dhcpd
inside instance get latest cirros image.
JIRA: FUEL-202
Change-Id: Icd44ebbdd7b4aa0cb55c080e614616a7b0198c0f
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Thu, 20 Oct 2016 10:00:36 +0000 (13:00 +0300)]
Rework processorcount limits to os_workers
JIRA: FUEL-212
Change-Id: I1c5b8fe123406f1a96c5432d91a9ee5806c7cf62
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michal Skalski [Wed, 19 Oct 2016 08:32:23 +0000 (08:32 +0000)]
Merge "Import fuel-infra.org key"
Alexandru Avadanii [Tue, 18 Oct 2016 11:49:03 +0000 (11:49 +0000)]
Merge "Fix handling of numbers in DEA and DHA files"
Michal Skalski [Mon, 17 Oct 2016 15:43:36 +0000 (17:43 +0200)]
Point to specific snapshot of mos repositories
Fuel 9.1 was released, it is a first time when new version of Fuel is
distributed through the same repositories as previous one, point to
specific snaphost of mos ubuntu repo to prevent mixing packages.
Change-Id: I64bb52657ce476b0c1fdc8e858231ad751ba12b1
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
Michal Skalski [Mon, 17 Oct 2016 18:11:12 +0000 (18:11 +0000)]
Merge "Re-introduce mirror blacklisting"
Peter Barabas [Mon, 17 Oct 2016 08:00:54 +0000 (10:00 +0200)]
Fix handling of numbers in DEA and DHA files
Fixes https://jira.opnfv.org/browse/FUEL-211
Change-Id: Iebb477b2a4ff370198d05edf595b5059ba47f51a
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
Ruijing Guo [Fri, 14 Oct 2016 07:52:52 +0000 (07:52 +0000)]
Merge "Compile DPDK to use basic cpu features"
Alexandru Avadanii [Wed, 12 Oct 2016 16:39:38 +0000 (16:39 +0000)]
Merge "ci, build/f_repos: Minor UX improvements"
Alexandru Avadanii [Wed, 12 Oct 2016 15:55:21 +0000 (15:55 +0000)]
Merge "deploy: templates: Fuel VM for Enea Armband lab"
Michal Skalski [Wed, 12 Oct 2016 07:59:19 +0000 (07:59 +0000)]
Merge "[ODL] Use OpenDaylight Boron"
Alexandru Avadanii [Sun, 9 Oct 2016 15:38:30 +0000 (17:38 +0200)]
ci, build/f_repos: Minor UX improvements
After Armband rework landed of top of `build/f_repos` mechanism [1],
the following minor UX improvements can also be applied to Fuel's
f_repos:
- set SHELL to "/bin/sh" (we don't use any bash-isms);
- improve "From SHA..." removal for exported patches;
- force checkout of root tag commit during clean;
- silence progress during git clone (cleaner logs);
- support git older than 1.8.4 in `make clean` (fix Armband deploy);
FIXME:
Pass TERM as Docker env var until [2] is fixed in Docker 1.13.
v4 -> v5:
* Moved `export TERM` to Releng, where it actually belongs [3];
* Fixed Armband deploys fail [4] by adjusting `make clean`;
[1] https://gerrit.opnfv.org/gerrit/#/c/22791/
[2] https://github.com/docker/docker/issues/9299
[3] https://gerrit.opnfv.org/gerrit/#/c/22933/
[4] https://build.opnfv.org/ci/view/armband/job/\
fuel-deploy-armband-baremetal-daily-master/57/consoleText
Fixes: FUEL-200
Change-Id: I80e3074f8659769e21f5b56f07c34c7a5de727bc
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Michal Skalski [Thu, 6 Oct 2016 13:12:34 +0000 (15:12 +0200)]
[ODL] Use OpenDaylight Boron
ODL Boron will be used in all scenarios except bgpvpn beacuse vpnservice
was removed in this release, we still will use Beryllium for this
scenario.
This change only replace Beryllium with Boron, it does not use any new
features like odl-netvirt-openstack.
Change-Id: I95264cc97f5b9e922ab3fb7dc024724d9fb83e9c
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
Stefan K. Berg [Tue, 11 Oct 2016 10:33:08 +0000 (12:33 +0200)]
Re-introduce mirror blacklisting
Some mirrors are misbehaving, for instance due to flood protection,
which makes them unreliable. This change re-introduces the possibility
to blacklist them locally.
Change-Id: I7840ac0a622f2997395e54911685f9eea393dee4
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Guo Ruijing [Tue, 11 Oct 2016 01:03:51 +0000 (09:03 +0800)]
Compile DPDK to use basic cpu features
Change-Id: I3ee9e5afa416af9e6a90b77f03ed9258c6bd4b1b
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Josep Puigdemont [Wed, 4 May 2016 12:27:23 +0000 (14:27 +0200)]
deploy: templates: Fuel VM for Enea Armband lab
This is the initial VM description fit for spawning Fuel Master
VMs in Enea's Pharos lab (Armband lab) [1, 2].
[1] http://www.enea.com/pharos-lab
[2] https://wiki.opnfv.org/display/pharos/Enea-pharos-lab
Change-Id: Ia89f9728fff0ab1c279f6200fd558d9643cf4ea5
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Mon, 10 Oct 2016 16:58:28 +0000 (18:58 +0200)]
deploy: Fix: remove storage files explicitly
Previous change [1] tried to move the responsibility of removing
storage files (raw, iso) from our python scripts to libvirt.
Although this works as expected for non-root invocations, like
Armband deploys, it fails to remove raw files in Fuel@OPNFV deploys.
Work around this by keeping both mechanisms (libvirt managed +
python explicit handling).
Related-bug: ARMBAND-128
[1] https://gerrit.opnfv.org/gerrit/#/c/22447
Change-Id: Ib846cd6071705b71d98824385835d724c729fd78
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Mon, 10 Oct 2016 11:11:01 +0000 (11:11 +0000)]
Merge "build: Use OPNFV_GIT_SHA for ISO preparer ID"
Alexandru Avadanii [Sun, 9 Oct 2016 17:04:28 +0000 (19:04 +0200)]
build/f_repos: Allow out-of-tree .git dir
ArmbandFuel@OPNFV uses Fuel@OPNFV git repo as a submodule, so
its .git dir is located outside work tree root (F_GIT_ROOT).
Allow this setup by parsing `git rev-parse --git-dir` intead of
harcoding git dir path.
Fixes: FUEL-200
Change-Id: Ia7f3b23e9333356fe05b9ed0565218f2c7ec8eba
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Wed, 17 Aug 2016 19:56:22 +0000 (21:56 +0200)]
build: Use OPNFV_GIT_SHA for ISO preparer ID
isoinfo -i lists the following information for Fuel@OPNFV ISO:
"Data preparer id:
86aafaf5454a846c417848bb94f264c4420160f3"
where the SHA hash is Fuel git repo HEAD SHA.
For Armband's build system, using only the Fuel commit ID is not
enough to fully describe the state of the source code, as patches
are also applied to other fuel modules (as git submodules).
Instead, a pointer to a valid Armband commit ID should be used.
However, Armband overrides OPNFV_GIT_SHA to the Armband git repo
commit hash, so the ISO metadata should also reflect this.
While at it, allow product name to be overriden, to signal the
commit ID should be looked up inside the Armband repository.
Change-Id: I33ad490f1afe28c1d439dda40e39cee1955e0ac2
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Stefan K. Berg [Wed, 21 Sep 2016 12:34:15 +0000 (14:34 +0200)]
Improving robustness of repo mirror selection
Change-Id: If0f5b268848439aa9d2abee099bbd985abd53d5c
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Alexandru Avadanii [Thu, 6 Oct 2016 13:15:32 +0000 (13:15 +0000)]
Merge "build: Use git submodules for Fuel git repos"
Alexandru Avadanii [Sat, 24 Sep 2016 15:27:16 +0000 (17:27 +0200)]
build: Use git submodules for Fuel git repos
This change reworks support for cloning (fetching) and patching all
Fuel components (fuel-library ... fuel-ui, see [1] for full list),
both outside the ISO build process (for development purposes, like
testing OPNFV patches apply cleanly to each component), and during
the ISO build.
The implementation relies heavily on git submodules and patches,
so backporting pending upstream gerrit changes, as well as adding new
out-of-upstream-tree patches, should be trivial.
Also, since without tracking remotes the repos rarely change, leverage
the in-place OPNFV build caching mechanism to drastically reduce the
number of git clones during each build.
The mechanism is detailed more in-depth in the JIRA ticket [3], and
it's merely a rehash of the submodule handling in Armband, implemented
initially by Stanislaw Kardach <stanislaw.kardach@cavium.com>.
Pros (+ new features):
- OPNFV patches for Fuel components can be applied (imported) or
developed (exported) outside of the ISO build process;
- git repo caching reduces the number of external pulls;
- reuse the same fuel-* componets in ALL targets
e.g. fuel-mirror used to employ 2 slightly different git trees;
- one step closer to Fuel/Armband merge (lots of steps left though);
Cons:
- adds a lot complexity to solve a non-problem (handling the repos
is fine in the current form, for the current goals);
However, patching <fuel-astute> or <fuel-agent> seems to be
quite complicated with the current mechanism, as env vars
override our locally patched repos for these components).
The proposed change should eliminate this issue completely.
CHANGE:
Aligned divergent fuel-mirror in ISO vs local repo build by
applying the 302 redirect fix ("Fixed handling http redirects") [2]
on top of 9.0.1 tag in fuel-mirror repo, and using that for both.
This obsoleted the followking mk file:
- build/f_isoroot/f_repobuild/config.mk
CHANGE:
Removed unused make target `get-fuel-repo` from build/config.mk.
FIXME:
Remote tracking is currently deactivated for all branches.
Change this when remote HEAD should be tracked instead,
e.g. during Newton rebase.
[1] https://github.com/openstack/fuel-main/blob/stable/mitaka/repos.mk#L32
[2] https://review.openstack.org/#/c/334882/
[3] https://jira.opnfv.org/browse/FUEL-200
TODO: Extend build/f_repos/README.md with info about:
- branch changes;
- tag bumps;
- patching now supports subdirs;
v5 -> v6:
* Added support for nesting patches in subdirs, to be used for feature
groups and related changes across submodules.
E.g. Upcoming multiarch EFI support could go in:
- .../f_repos/patch/fuel-agent/multiarch-efi/...;
- .../f_repos/patch/fuel-astute/multiarch-efi/...;
While Armband patches could go in:
- .../f_repos/patch/fuel-agent/armband/...;
- .../f_repos/patch/fuel-astute/armband/...;
etc.
v6 -> v13:
* fix wrong tag used for VERSION dump;
* fix wrong tag used for patches-export;
* move OPNFV_TAG to main config.mk and use it in FUEL_*_COMMIT;
* only run `patches-import` when patches changed / not yet applied;
* only run `clean` for stale `.cacheid` (avoid re-applying patches);
* allow git submodule path/name to be different (FIXED);
* put-cache should only run when artifact is not already cached;
* `git am`: use 3-way merge so already applied patches are gently
skipped (useful for upstreaming patches from Armband);
* Properly support nested patch dirs;
* Colorize the output a little;
JIRA: FUEL-200
Change-Id: I9dbdd9b3022896d4497d21be8dacc859730db489
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Tue, 4 Oct 2016 15:26:57 +0000 (17:26 +0200)]
build/docker: CI: no tag reuse on env var change
The previous change adding support for OPNFV build tag reuse
added the get/put-cache functionality to `build/docker` just
for detecting env var changes between tag creation and current build.
Obviously, when building outside CI, it is up to the end user to
force a docker rebuild when env vars change (this was the behavior
before the tag reuse support too).
An alternative approach would be removing get/put-cache completely,
if we consider the env vars (http proxy related) never change for
CI cached builds (seems to be true, worst case we wait 1 day for
the tag to expire when it happens).
This change just fixes the original intended behavior in tag reuse.
JIRA: FUEL-204
Change-Id: I14666994bc334012a5198a64a4a24cd4962e4bd6
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Michal Skalski [Tue, 4 Oct 2016 13:56:24 +0000 (13:56 +0000)]
Merge "Use tacker plugin in SFC scenario"
Alexandru Avadanii [Tue, 4 Oct 2016 09:59:30 +0000 (09:59 +0000)]
Merge "build/docker: Reuse tagged image for OPNFV build"
Michal Skalski [Mon, 3 Oct 2016 12:05:22 +0000 (14:05 +0200)]
Use tacker plugin in SFC scenario
JIRA: FUEL-205
verify: no-cache
Change-Id: I37746bf3e490f6b707de8fe56af10f1df932908c
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
Michal Skalski [Mon, 3 Oct 2016 12:15:02 +0000 (12:15 +0000)]
Merge "Integration of fuel-plugin-tacker"
Michal Skalski [Mon, 3 Oct 2016 08:55:03 +0000 (08:55 +0000)]
Merge "Simplify decrement"
George Paraskevopoulos [Fri, 30 Sep 2016 12:21:26 +0000 (15:21 +0300)]
Integration of fuel-plugin-tacker
JIRA: FUEL-205
This change integrates https://github.com/openstack/fuel-plugin-tacker
to the Fuel project.
Change-Id: I51b1bdeeb678e55b85393f6a9f8180fc79322e8f
Signed-off-by: George Paraskevopoulos <geopar@intracom-telecom.com>
Alexandru Avadanii [Sat, 1 Oct 2016 17:14:51 +0000 (19:14 +0200)]
build/docker: Reuse tagged image for OPNFV build
During CI build loops, the workspace is freshly fetched,
so '.docker' make target is built each time.
Reuse existing 'opnfv.org/ubuntu-builder:14.04' tag if present, but
enforce a configurable lifespan for this tag (currently 1 day), so
it does not get stale.
JIRA: FUEL-204
Change-Id: I8d1bd81f3e5e81068e9586c9bea9f43b3327eb38
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Jonas Bjurel [Thu, 29 Sep 2016 19:47:28 +0000 (19:47 +0000)]
Merge "use pgrep instead of ps"
Jonas Bjurel [Thu, 29 Sep 2016 19:44:26 +0000 (19:44 +0000)]
Merge "check read access instead of isfile() for Fuel ISO"
Ross Brattain [Wed, 8 Jun 2016 15:56:34 +0000 (08:56 -0700)]
check read access instead of isfile() for Fuel ISO
When testing with nested virtualzation I attached
the Fuel ISO to VM (/dev/sr0) running deploy.sh
This failed because we expect the ISO to be a file, when
it could be a device, e.g. /dev/sr0. Instead of checking isfile()
check for read access.
This tested with bsdtar. It can extract an ISO from a file or device.
Change-Id: Ic09373cd618b33382303d9134cce4e005040de95
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
Ross Brattain [Tue, 28 Jun 2016 00:35:57 +0000 (17:35 -0700)]
use pgrep instead of ps
pgrep was added to procps-ng, it is more exact
also replace ps -ef in wait_until_fuel_menu_up
removed get_fuel_menu_pid
Change-Id: I57ad9d2fabbfe5f570e0be3bfb40ef842f95902d
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
Peter Barabas [Mon, 26 Sep 2016 11:10:56 +0000 (13:10 +0200)]
Refactor deploy-config.py into object style
Change-Id: I706563e6ed1bbfd98adc5a4124ff63789f9e32fa
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
Michal Skalski [Thu, 29 Sep 2016 07:25:43 +0000 (07:25 +0000)]
Merge "[odl-l3] Get OVS plugin into the action"
Michal Skalski [Wed, 28 Sep 2016 14:47:22 +0000 (14:47 +0000)]
Merge "Support different format of fuel task info"
Peter Barabas [Wed, 28 Sep 2016 14:07:01 +0000 (16:07 +0200)]
Simplify decrement
Change-Id: I5ad9ee013cc3ac07e75b4c94d71af3c9fd46d281
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
Michal Skalski [Wed, 28 Sep 2016 07:24:36 +0000 (07:24 +0000)]
Merge "Add DHA adapter dependencies"
Michal Skalski [Tue, 27 Sep 2016 21:31:52 +0000 (23:31 +0200)]
Support different format of fuel task info
As described in this bug: https://bugs.launchpad.net/fuel/+bug/
1625518
json output of the task can be in different format: single dict or list
of dicts. During tests of https://gerrit.opnfv.org/gerrit/21807 only the
later one was visible, try to support both types of output.
Change-Id: I7d3e12270c8246b03bdc6c73d3be77a039df469f
Signed-off-by: Michal Skalski <mskalski@mirantis.com>