summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-08-11Merge "Fix merge_dicts logic for the case of two nonempty lists"Michal Skalski1-9/+11
2016-08-11Merge "Pass host cpu flags to compute guests"Michal Skalski1-0/+3
2016-08-11Merge "Rebase OVS with DPDK"Guo Ruijing1-1/+1
2016-08-11Pass host cpu flags to compute guestsMichal Skalski1-0/+3
Both kvm and ovs plugins require specific cpu flags. Host-model mode will pass most of the host cpu flags to guest. If a hypervisor is not able to use the exact CPU model, libvirt automatically falls back to a closest model. JIRA: FUEL-157 Change-Id: I77ce625e118b6de51cbcdb58e4be5a6dcaecf384 Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-08-10Merge "Revert "Pass host cpu flags to compute guests""Michal Skalski1-3/+0
2016-08-10Revert "Pass host cpu flags to compute guests"Michal Skalski1-3/+0
This reverts commit 34da00c2baa6abc69a812aae4c30a82ebae561bd. Change-Id: I495fa1f71ac30e259ca63e90ca8b38dd2300d469 Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-08-10Merge "Provide access to mgmt network from host level"Michal Skalski4-24/+25
2016-08-10Merge "Pass host cpu flags to compute guests"Michal Skalski1-0/+3
2016-08-10Merge "tacker-server patch updated"Michal Skalski1-4/+3
2016-08-10Fix merge_dicts logic for the case of two nonempty listsFedor Zhadaev1-9/+11
JIRA: FUEL-170 Change-Id: I5abae6fc950cdabe064b5402d9555cedf81cfc23 Signed-off-by: Fedor Zhadaev <fzhadaev@mirantis.com>
2016-08-10Pass host cpu flags to compute guestsMichal Skalski1-0/+3
Both kvm and ovs plugins require specific cpu flags. Host-model mode will pass most of the host cpu flags to guest. JIRA: FUEL-157 Change-Id: Iff620a4b4f5948e54f6f8db01411d6659f08ec00 Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-08-10Provide access to mgmt network from host levelMichal Skalski4-24/+25
Functest framework is trying to access internal endpoints from host level which currently is not possible in virtual deployments. Move mgmt network to untagged interface and setup IP address from mgmt subnet on the linux bridge where mgmt traffic is traversing. There will be corresponding changes in securedlab repository. JIRA: FUEL-167 Change-Id: I29b8ebb23a64e39a4e56b27639a87ce2386b9774 Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-08-10Rebase OVS with DPDKGuo Ruijing1-1/+1
1. Rebase OVS to commit 9f4ecd654dbcb88b15a424445184591fc887537e 2. Rebase DPDK to 16.07 3. Fix 2 vms in 2 hosts ping each other issue 4. update demo script Change-Id: I85b56ab6e3a735bbf26df8d4df22f2d76b9fb1d3 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
2016-08-10Merge "Rebase to collectd-ceilometer-plugin stable/mitaka 1. fix ↵Guo Ruijing1-1/+1
pbr:version_string in collectd-ceilometer-plugin 2. disable collectd build to use stock collectd 3. update README in fuel plugin"
2016-08-09tacker-server patch updatedferenc Cserepkei1-4/+3
The deb package control is changed in Mitaka, so the patch should be updated as well. Change-Id: Ifde84e19da72217a5cca73e0da366e21625cd21b Signed-off-by: ferenc Cserepkei <ferenc.cserepkei@ericsson.com>
2016-08-09Merge "Use ODL Be SR3"Michal Skalski1-2/+2
2016-08-09Rebase to collectd-ceilometer-plugin stable/mitakaGuo Ruijing1-1/+1
1. fix pbr:version_string in collectd-ceilometer-plugin 2. disable collectd build to use stock collectd 3. update README in fuel plugin Change-Id: I773910c03d109af1fc1f86a5709105e9ffbfc350 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
2016-08-08Merge "POC script updates for Colorado"Nikolas Hermanns1-7/+18
2016-08-08Merge "bootstrap_admin_node: Fix connectivity check."Michal Skalski1-0/+11
2016-08-08Use ODL Be SR3Michal Skalski1-2/+2
JIRA: FUEL-165 Change-Id: I483f23c2f74313020d6a3dbb88079558d6674010 Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-08-08Merge "Fix OVS scenarios to use fuel-plugin-ovs"Michal Skalski3-352/+78
2016-08-08Merge "Don't use -f flag with docker tag"Michal Skalski1-1/+10
2016-08-05Merge "Allow to use Intel NICs for DPDK on Ericsson POD2"Michal Skalski4-6/+29
2016-08-05Don't use -f flag with docker tagMichal Skalski1-1/+10
-f flag has been deprecated since v1.10.0 and is removed from v1.12.0. If user use recent version of docker iso built will fail. https://docs.docker.com/engine/deprecated/#/f-flag-on-docker-tag JIRA: FUEL-163 Change-Id: If42781f342d59db7672322ec07063d09a23e1dcb Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-08-04Fix OVS scenarios to use fuel-plugin-ovsFedor Zhadaev3-352/+78
* Use fuel-nshovs instead deprecated fuel-nfvovs * Modified scenario to enable DPDK via Fuel * Removed hard dependency from specific POD * Add ability to merge networks lists JIRA: FUEL-156 JIRA: FUEL-162 Change-Id: Ie609ff140f1de96e54df37dd9b1881afec792317 Depends-On: Ic6072d938e09a40516c32cdde6223d0a21e57403 Signed-off-by: Fedor Zhadaev <fzhadaev@mirantis.com>
2016-08-03Allow to use Intel NICs for DPDK on Ericsson POD2Michal Skalski4-6/+29
JIRA: FUEL-161 Change-Id: I009ba7e9587f3c47d8e609c96b0666394887929e Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-08-03Fix config for no-ha kvm scenarioMichal Skalski1-4/+4
JIRA: FUEL-157 Change-Id: I09e595902b2c467b5522b7b37a772f7ab35c8cea Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-08-03POC script updates for Coloradoferenc Cserepkei1-7/+18
Change-Id: I2afb7826a5dcc22f5d810312e1ff027a0b5fcbfa Signed-off-by: ferenc Cserepkei <ferenc.cserepkei@ericsson.com>
2016-08-03Merge "Add collectd package for collectd ceilometer plugin"Michal Skalski1-0/+2
2016-08-02bootstrap_admin_node: Fix connectivity check.Alexandru Avadanii1-0/+11
After Fuel Master builds the bootstrap image at first boot, internet connectivity is tested using the URL for the CentOS updates repository. bootstrap_admin_node.sh script parses the output of `yum repolist`, looking for entries like 'Repo-baseurl: http://...'. However, in Fuel 9.0, <updates> points to a mirrorlist file (a text file containing a list of possible mirror URLs) instead of being a single, direct link to the repository. Also, note that in Fuel9, <updates> and <security> repos are disabled by default. For now, we only test that we can access the mirrorlist file, while the check should be performed against the mirror(s). Old (Fuel 8) repo entry format: Repo-baseurl: http://mirror.fuel-infra.org/.../updates/x86_64/ New (Fuel 9) mirrorlist format: Repo-mirrors: http://mirror.fuel-infra.org/.../mos-mirrors-updates.txt Backported from upstream change [1], which should fix bug [2]. This change will get merged upstream in Fuel 10. [1] https://review.openstack.org/#/c/335094/ [2] https://bugs.launchpad.net/fuel/+bug/1596981 Change-Id: Ibec397af2e1d925a011907f14e1d655741e280fb Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-08-02build: fuel-main: Decouple patches, Makefile.Alexandru Avadanii4-142/+93
Tested in armband, with very small adaptions. Use `git apply` and/or `git am` in favor of `patch`. Change patches from old context format to unified diff. This change allows us to decouple Makefile and patches. This means we no longer have to manually stage touched files before committing them to git. Possible improvements: - move patches to separate dir and add ordering info (prefix); - merge patches (currently we have one per touched file); Remove obsolete (unused?) patch: - fuel-main_docker_version.patch Change-Id: I5b621370993b259779c813b47105f632948e6da7 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-08-02Merge "Add functionality to generate a base DEA file"Michal Skalski2-5/+55
2016-08-02Merge "Make it possible to include files in templates"Michal Skalski2-0/+110
2016-08-02Merge "Refactor deploy-config.py"Michal Skalski1-96/+147
2016-08-02Add functionality to generate a base DEA filePeter Barabas2-5/+55
- Add template file for base DEA Change-Id: I8055087b992fdc9850852bad9fa07a4e4fde0085 Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-08-01Make it possible to include files in templatesPeter Barabas2-0/+110
Change-Id: I45c42ac65cfbe6562f0035df3375a2231148e22e Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-08-01Refactor deploy-config.pyPeter Barabas1-96/+147
- fix vertical whitespace - more consistent function naming - clean up file writes - break up some long lines - typo fixes - remove duplicate spaces - unify print's Change-Id: I5517747ef9f2e39ade7fb553ae2b1547fdf7b9e1 Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-07-27Fix configuration for kvm scenarioMichal Skalski2-4/+38
JIRA: FUEL-157 Change-Id: I5baafd4395a2d298a24cccda042d5b43824ae7a0 Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-07-26Merge "Fix default value for plugin metadata"Michal Skalski1-5/+2
2016-07-26Merge "Add ability to override node attributes"Michal Skalski1-2/+52
2016-07-26Merge "Update collectd ceilometer fuel plugin installation scripts"Guo Ruijing1-1/+1
2016-07-26Merge "Minor fixes in yardstick fuel plugin"Guo Ruijing1-1/+1
2016-07-22Add templating support for generating config filesPeter Barabas2-0/+446
- Remove unneeded method - Write result to a file and not STDOUT - Add documentation - Remove trailing whitespace - Documentation corrections Change-Id: I7532222d3512380c4f1129bd05dc2ba37b409dc2 Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-07-22Add ability to override node attributesFedor Zhadaev1-2/+52
Fixes https://jira.opnfv.org/browse/FUEL-152 Change-Id: I444bf3aef54ffd53c53431e2795b11b10545f55f Signed-off-by: Fedor Zhadaev <fzhadaev@mirantis.com>
2016-07-21Pinning down exact Fuel 9.0.1 repo versionsMichal Skalski4-23/+17
stable/mitaka branch is open for new commits for Fuel 9.1. To not be impacted by new upstream changes point to specific commits which were used for Fuel 9.0 General Availabilit (9.0.1). JIRA: https://jira.opnfv.org/browse/FUEL-153 verify: no-cache Change-Id: I7fd8d2f11e4be6f47e39924913c48bfe7d4f2eb3 Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-07-21Temporary fix for bgpvpn plugin buildsMichal Skalski1-1/+1
JIRA: FUEL-154 Change-Id: Iad554aef8db9a6d01c408c0014dabf45e4c1a0e6 Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-07-20Update the commit ID of kvmfornfv upstream for fuel-plugin-kvmdavidjchou1-1/+1
This version of kvmfornfv upstream fixed the issue of failing to launch instances in Horizon after OPNFV environment deployed. Change-Id: I05fa9f977924ee679312c599ee0bccabaf7bf1a9 Signed-off-by: davidjchou <david.j.chou@intel.com>
2016-07-20Add collectd package for collectd ceilometer pluginGuo Ruijing1-0/+2
Change-Id: I8da0087d8f17f5f2e4c3275a26ad2ca164878226 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
2016-07-20Fix default value for plugin metadataFedor Zhadaev1-5/+2
Fix typo which result in error while getting default metadata in case if it's not overridden in scenario. Fixes https://jira.opnfv.org/browse/FUEL-151 Change-Id: Ibf40f846919155e27da5dc1f778f72afee79ff12 Signed-off-by: Fedor Zhadaev <fzhadaev@mirantis.com>
2016-07-20Minor fixes in yardstick fuel pluginGuo Ruijing1-1/+1
Change-Id: Ifc4a31efc8a2717eaccb7b39fa36e1282eb16173 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>