aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-08-09Merge "Use ODL Be SR3"Michal Skalski1-2/+2
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>
2016-07-20Update collectd ceilometer fuel plugin installation scriptsGuo Ruijing1-1/+1
Change-Id: I4019b2167092f522a3d2533bf20b2ea04bb3b2b2 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
2016-07-19Build new cache when list of packages has changedMichal Skalski3-5/+38
Create a new cache of f_repobuild job when list of packages required by plugins has changed. JIRA: FUEL-150 Change-Id: I079950eaa9e3b32ea7baa3f6d4a37cc37f99f3a7 Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-07-18Merge "Update fuel yardstick plugin 1. update fuel plugin builder 2. ↵Guo Ruijing1-1/+1
change install directory in yardstick plugin 3. update README"
2016-07-14Merge "Add fuel collectd ceilometer plugin"Guo Ruijing3-1/+104
2016-07-13Merge "Update NSH patches"Michal Skalski1-1/+1
2016-07-13Update fuel yardstick pluginGuo Ruijing1-1/+1
1. update fuel plugin builder 2. change install directory in yardstick plugin 3. update README Change-Id: I8d717ef568aeaa7958cd1a3161d4ef8ca17a1de1 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
2016-07-13Add fuel collectd ceilometer pluginGuo Ruijing3-1/+104
Change-Id: I2f95d9166e2d0d7508551de8b87dc6c84800e3c1 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
2016-07-12Aligning machine type over Ubuntu and CentosStefan K. Berg12-12/+12
We have previously used "pc-1.0" as the qemu-kvm machine definition for virtual Fuel deploys. On Ubuntu this points to: pc-1.0 Standard PC (i440FX + PIIX, 1996) On CentOS 7 this machine definition does not exist, but there's a match in "pc": pc RHEL 7.0.0 PC (i440FX + PIIX, 1996) (alias of pc-i440fx-rhel7.0.0 So, finally, pc is also in Ubuntu: pc Ubuntu 14.04 PC (i440FX + PIIX, 1996) (alias of pc-i440fx-trusty) This change is about exploring whether moving to "pc" will make the auto deploy work on both platforms with the "pc" machine type. What still needs to be done in CentOS is to create a symlink from /usr/libexec/qemu-kvm and /usr/bin/kvm though. Change-Id: I1cce52a21075950cb59b75709b12d724d759e3e6 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2016-07-12Update NSH patchesGuo Ruijing1-1/+1
1. update patches from commit 307b06d Change-Id: Ibaba101833a934840b4491925ff944f1420fce2e Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
2016-07-08Merge "[BGPVPN] Do not include temporary files in plugin"Michal Skalski1-1/+1
2016-07-08Merge "deploy: ISO rebuild: use -joliet-long names."Michal Skalski1-0/+1
2016-07-08Merge changes from topic 'multiple-nics-for-fuel-vm'Michal Skalski3-15/+28
* changes: deploy: add support for multiple bridges virtual_fuel: prepare class to allow multiple bridges
2016-07-08deploy: ISO rebuild: use -joliet-long names.Alexandru Avadanii1-0/+1
Armband adds similar files, which tend to have long names and only differ in suffixes (e.g. DEBs for amd64 vs arm64). Previous change [1] fixed ISO build errors, but failed to address the deploy.py ISO rebuild (which modifies and recreates the ISO, calling mkisofs, which complains about clashing file indexes). This works around ISO rebuild error(s) like: "genisoimage: Error: ./ubuntu/pool/main/g/golang-gogoprotobuf/golang-gogoprotobuf\ -dev_0.0~git20150828.0.6cab0cc-1~u14.04+mos1_arm64.deb and ./ubuntu/pool/main/g/golang-gogoprotobuf/golang-gogoprotobuf\ -dev_0.0~git20150828.0.6cab0cc-1~u14.04+mos1_amd64.deb have the same Joliet name" [1] https://gerrit.opnfv.org/gerrit/#/c/14973/ Change-Id: If58a18ba46343a52ce6e9a0a6a0482c1a3079451 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-07-08[BGPVPN] Do not include temporary files in pluginMichal Skalski1-1/+1
Change-Id: Idd2e2f403a2dd5be44c480e8b493e4281ade1994 Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-07-08Point to newer commit in ODL plugin repoMichal Skalski1-1/+1
Use small fix for setting ovsdb managers. Change-Id: Ie405d4a2db59ea490ff0a690bb310c0c74d8de79 Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-07-06Point to latest commit in bgpvpn plugin repoMichal Skalski1-1/+1
Currently we use commit before uplift to mitaka. Change-Id: Ie08a548b133aff01cc2457bd74d0fe7a86a18eff Signed-off-by: Michal Skalski <mskalski@mirantis.com>