aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-01-29Merge "Rebase of ks.cfg due to upstream changes" into stable/brahmaputraStefan K. Berg2-16/+86
2016-01-29Merge "Use e1000 network driver in virtual labs" into stable/brahmaputraStefan Berg12-36/+36
2016-01-29Merge "Use Fuel 8 CLI compatible commands" into stable/brahmaputraStefan Berg4-20/+8
2016-01-29Merge "Sync with recent changes in fuel-main" into stable/brahmaputraStefan Berg3-11/+178
2016-01-29Merge "Uplift deployment code for Fuel 8.0" into stable/brahmaputraStefan Berg4-19/+48
2016-01-29Merge "Turn predictable network interface names back on" into stable/brahmaputraStefan K. Berg1-4/+1
2016-01-29Merge "Cache as we go instead of in the end" into stable/brahmaputraStefan K. Berg10-5/+33
2016-01-29Merge "All plug-ins except those explicitly rebased are disabled" into ↵Stefan Berg1-1/+2
stable/brahmaputra
2016-01-29Merge "Break early in build if docker-in-docker fails" into stable/brahmaputraStefan K. Berg1-0/+2
2016-01-29onos-configdongfeng1-0/+24
Change-Id: I10af719aa70dd9fde333542f507033903a6224de (cherry picked from commit 970db3c06849fb149b4844fc66d971994088c243)
2016-01-29Support new plugin configuration schemaMichal Skalski1-5/+15
In Fuel 8.0 it is possible to install many version of the same plugin. Because of that there is additonal structurce in plugin configuration. Assumption is that we only use one version of the plugin. Change-Id: I50d5bc32dd6dab6fe2541748dd8404d887e336e0 Signed-off-by: Michal Skalski <mskalski@mirantis.com> (cherry picked from commit e47ffb12088f4e2a2e679c4343602c09f9ff1525)
2016-01-29Rebase of ks.cfg due to upstream changesStefan K. Berg2-16/+86
Change-Id: I488851ded40e88180359d545259ec0631416d32d Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com> (cherry picked from commit a1e787440c7487368c813834a72bd08137bbbcf9)
2016-01-29Use Fuel 8 CLI compatible commandsPeter Barabas4-20/+8
Change-Id: Icd2feed7326772837c74f35688160d1eb0c25652 Signed-off-by: Peter Barabas <peter.barabas@ericsson.com> (cherry picked from commit b4cc8935a0b22c4104cbeec027a7325afff9b3ae)
2016-01-29Use e1000 network driver in virtual labsMichal Skalski12-36/+36
In the past virtio network driver cause problems when vlan segmentation was used [1][2]. E1000 driver looks like safer choice. [1] https://bugs.launchpad.net/fuel/+bug/1433593 [2] https://bugs.launchpad.net/fuel/+bug/1463316 Change-Id: I0a573e640309ad3caf2d67166cdaeaf285a6e6be Signed-off-by: Michal Skalski <mskalski@mirantis.com> (cherry picked from commit 4b87e1e902e44971740ca020b164327d463d12c8)
2016-01-29Sync with recent changes in fuel-mainMichal Skalski3-11/+178
Change-Id: Ife63c8c69e0e17150c198a7a75788a13b8df0d81 Signed-off-by: Michal Skalski <mskalski@mirantis.com> (cherry picked from commit 74f53db80b0fb55f4a8d15e88add63f0ef3147ec)
2016-01-29Uplift deployment code for Fuel 8.0Peter Barabas4-19/+48
Change-Id: If784cbd7371133bd35e95004a11e9802660ac332 Signed-off-by: Peter Barabas <peter.barabas@ericsson.com> (cherry picked from commit 91257ff4ee78f32081af2e652f58a5ba9e834f61)
2016-01-29Turn predictable network interface names back onStefan K. Berg1-4/+1
Returning to the stock behaviour of Fuel 8. Change-Id: I410253f89b28ece93a792937f9c1abccb8552311 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com> (cherry picked from commit 8ce080bcbb40f87c73e040998a83333525fee047)
2016-01-29Cache as we go instead of in the endStefan K. Berg10-5/+33
In order to speed up the build process when building with the cache enabled, cache immediately following the build of a sub artifact instead of at the end. Should the build fail, we don't need to rebuild those parts that already were successful in the last build. Change-Id: I23b59f7ba4a04272aea855cf451793158fe12241 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com> (cherry picked from commit d2c5a1dde91d10b4f3f9f5ac0b1570527247e03c)
2016-01-29All plug-ins except those explicitly rebased are disabledJonas Bjurel1-1/+2
Plugin providers need to enable plugins as they get rebased to Fuel8 and builds successfully Change-Id: Iea0847a1fc0484cf0900912ab6e07bfa501bc479 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com> (cherry picked from commit 307abd417ed218d1245f8fd829d0265999f3ae18)
2016-01-29Break early in build if docker-in-docker failsStefan K. Berg1-0/+2
Change-Id: Ic5d8779f938133a958627170bd379198bec36342 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com> (cherry picked from commit f7237753a6f07b872cea23331c1e779941906ace)
2016-01-29Start sshd daemon before fuelmenuMichal Skalski1-0/+11
OPNFV deploy script require ssh connectivity to fuel master node to discover if fuelmenu process is started. Change-Id: Ib9aa61f98d15d0554b135f4c0c8887cd0a2d36ce Signed-off-by: Michal Skalski <mskalski@mirantis.com> (cherry picked from commit 6366a06bb43d5db7b54c454df57831292966d6d4)
2016-01-29OpenDaylight plugin for brahmaputra releaseMichal Skalski2-54/+72
Include new version of fuel-plugin-opendaylight. Changes in this version: - Support MOS 8.0. - Move ODL installation and configuration to main phase of deployment. - L3 traffic managed by ODL possible when vxlan tunneling is used. - Include snapshot of OpenDaylight Beryllium, stable version not available at this moment. - Get rid of hardcoded configuration related to specific ODL version. Now plugin is more elastic and should support a broader number of ODL versions. - odl_network_scheme function overrided standard network scheme so custom network templates are not required. - ODL is no longer patched to use br-floating bridge JIRA: FUEL-58 Change-Id: Ie3542e285a064c37d1edb6751c4853a5e7594478 Signed-off-by: Michal Skalski <mskalski@mirantis.com> (cherry picked from commit 3778f82dfe7afe258a9584f72f82ac2ee6e8d92b)
2016-01-29Merge "Templates for configuration guide" into stable/brahmaputraStefan Berg1-0/+0
2016-01-29Merge "f_ovsnfv-dpdk-pluginbuild: Update repo location" into stable/brahmaputraStefan Berg2-6/+8
2016-01-29Select closest Fuel mirror as measured by pingStefan K. Berg2-1/+36
Select the (hopefully) geographically closest Fuel mirror to speed up the build time. Change-Id: I586d90ae58a9c22b1cf60df1bdb907c0e97486fa Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com> (cherry picked from commit 49ccd1f337d09cc84b168afd970acaa2aaceff25)
2016-01-29Restore ISO file name to make CI functional againStefan K. Berg1-2/+2
An overzealous designer :) renamed the ISO output file, which broke CI. This will put everything right again. Change-Id: I25dca7ecfaa679872ee3d670b5df56333b3321c4 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com> (cherry picked from commit d0d32d0dcde36e4a6a60e5846bfa1204e98b2d10)
2016-01-29Store Fuel ISO in build cache as it is builtStefan K. Berg1-0/+4
Right not the build cache is populated after a full (successful) build. As the Fuel ISO takes some time to build, this saves quite some time in the cases where the ISO is built successfully but a following plugin build fails. Change-Id: Ic6be1f5b5d00b9436eb0f82911cf28b449d0a156 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com> (cherry picked from commit c31529bb3b54a4c0db244c0929659f120f735fab)
2016-01-29Use mirrors snapshotsMichal Skalski5-12/+47
Add logic to fetch information about last suitable snapshot which can be used to download ubuntu packages. This is for example use to build community ISO [1]. This should help in case of snapshot switch [2]. [1] https://github.com/fuel-infra/jenkins-jobs/blob/master/servers/fuel-ci/8.0/builders/community.all.sh#L36-L40 [2] https://bugs.launchpad.net/fuel/+bug/1493390/comments/9 Change-Id: Id5a8d41278561473ea4844631bfefa0049e64dbc Signed-off-by: Michal Skalski <mskalski@mirantis.com> (cherry picked from commit 394c79fe428faa9c50ed1db6d750b363b44130b9)
2016-01-29Turn on fuelmenu by default, turn off biosdevnameStefan K. Berg11-43/+217
Added experimental Fuel build loop, rebuilding up to ten times while keeping the package cache, in the hope that all packages will be able to download. Added snapshot support into this script as well. Changed naming of OPNFV iso label to OPNFV_FUEL_<id>, made changes in ks.cfg and isolinux.cfg to look for this name at install. Change-Id: Ic28a3af769cfc90416d7d988afd6f07eadcef4f1 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com> (cherry picked from commit 35697966da656585c43e2a2342a135ada65703cb)
2016-01-29Small updates to build-requirements for docker stuff.Daniel Smith1-5/+11
fixed whitespace x2 Change-Id: Ie9d52f820400df10d88ade035f2900aecab0c66d JIRA:0 Signed-off-by: Daniel Smith <daniel.smith@ericsson.com> (cherry picked from commit 5efee382a2457f32e6202214247d76098b8bb45b)
2016-01-29Correction of cache handling for ISO buildStefan K. Berg1-5/+8
The cache id was not generated considering config.mk nor Makefile. Change-Id: I29ae0d60b89d4653cb38cffe83f666c5056daf63 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com> (cherry picked from commit dc8eec07243d65c99be15bda2c112c35caa48c54)
2016-01-29Ignoring pyc and eclipse filesNikolas Hermanns1-5/+5
Change-Id: I6883c45b805ba52ed485c634300c86652c9cb9e0 (cherry picked from commit 516e97efb5a47e6e2b88f1b237f3f9e1c6465832)
2016-01-29f_ovsnfv-dpdk-pluginbuild: Update repo locationMark D. Gray2-6/+8
The code for fuel-plugin-ovsnfv has been moved to the ovsnfv OPNFV project repository. This patch updates the OPNFV fuel plugin builder to use this location. Change-Id: Ida1640ea6005aa1f4b31be145913556d6b05aa6e Signed-off-by: Mark D. Gray <mark.d.gray@intel.com> (cherry picked from commit 42d1a8174af0f2081a9de76c798ee2b081cc0686)
2016-01-29Templates for configuration guideSofia Wallin1-0/+0
Please use the installerconfig.rst to describe the configuration for each installer. Removed configoptions from the patch, we will provide patches for the post install procedures template during the day. Change-Id: If315520f153c60e12e6d188fc5e5ba8c1a5bd865 Signed-off-by: Sofia Wallin <sofia.wallin@ericsson.com> (cherry picked from commit a9ddf96d44ddeb8afbb4e93039b7257ea83aba1d)
2016-01-22Fix to allow more physical nodes defined in DHA than node definitions in deaJonas Bjurel2-3/+4
NOT VERIFIED DO NOT MERGE Change-Id: Id5b6029d11bfcd394e6f84a7b73b8a17820561cf Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2016-01-22add map for onos virtual deploymentdongfeng1-0/+6
Change-Id: I331a9936156730e58846007f154e6eadaeedd5ba (cherry picked from commit 9f1fe75c7208183d84cc4600670e7e0b2e58abd2)
2016-01-21Scenario uplift to Fuel8Jonas Bjurel9-7/+1136
- Re arranged node-roles according to Fuel8 requirements o There must be at least 3 CephOSD nodes o Ceph-OSD cannot be co-located with Mongo o Mongo cann not run on compute Change-Id: I55b99bb4e5779170b31a56025d36b9b55a1a4da2 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com> (cherry picked from commit 0068505bab4bb8960594d4865a61fd3661bbe981)
2016-01-20Fixed DNS and NTP serves for default virtual lab definitionsJonas Bjurel1-10/+10
Change-Id: I47a5e2b3bc0e74c44256c6733e331b89889cf9c7 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com> (cherry picked from commit 218381cdc6073510d7ee280c1a5f54e56b25b051)
2016-01-19Temporary fix for ONOS deployment scenario.Jonas Bjurel1-2/+10
- Although ONOS supports L3, this patch doesnt let the L3 capabilities of ONOS loose - this is due to OPNFV Pharos lab incompatibilities with ONOS. Hope to have a fix soon - Also provides a template for scenario short names Change-Id: Ie86bcdc23492ee0fd7a19c11eecfca07afb64df3 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com> (cherry picked from commit bc8d77ae064f1e6ed910edaf37a0c27beed33026)
2016-01-18Integration of vsperf pluginJonas Bjurel4-1/+110
VERIFIED READY TO MERGE Change-Id: Ia3b01c0de1081ce24e4db361ba6e77475e8ea291 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com> (cherry picked from commit bb22abb222dd0add134a4f911042422594e6f47b)
2016-01-14Adding fuel-bgpvpn-plugin and ScenarioNikolas Hermanns3-0/+142
To use the bgpvpn fuel plugin configs where added and a first scenario using it is added Change-Id: Id3c65abe39e1945f6a451c523732a513b01db696 (cherry picked from commit 76aa5bd1daf9568ab91f7586b0627062ffb26fb0)
2016-01-14Removing CPU specification from TemplatesNikolas Hermanns6-162/+0
Not all the flags are supported by every machine. This patch removes the specification of cpu and lets libvirt decide what cpu model is used. Change-Id: I1f183560e47d58abcfe496838a815d3f3594ee1b (cherry picked from commit a732cb72ef59f11a0de1df4cbcb2630fa88afd8d)
2016-01-13Align scenario short names between installersFatih Degirmenci1-16/+23
The fields in scenario short name is agreed between joid and fuel as below. os-[controller]-[feature]-[mode](-[optionalparameter]) Change-Id: I3729e660c10429df0e2d8cf25e4b5a66128afa7e Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com> (cherry picked from commit 239f910e2a5999ad21c995bcf85441006b69a577)
2016-01-13VLAN Segmentation scenarios needed for virtual traffic classifierJonas Bjurel3-0/+248
Change-Id: I2a42cff6f128bc0faca40bd6576c52282e66c0f4 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com> (cherry picked from commit 9e2b5ea04932ad255882d1e707fb2b7eae5afcf9)
2016-01-13Fix build failure in fuel base & qemuRuijing Guo2-0/+19
Change-Id: I4a6cc047011547402641619a5683af3d24c057ee Signed-off-by: Ruijing Guo <ruijing.guo@intel.com>
2016-01-12Deploy Scenario bug-fixesJonas Bjurel1-2/+2
- Fixed HA defenition for ODL-L2 and ODL-L3 in scenario.yaml Change-Id: I60cbac779b2faa34f0bf96159839826e157295fe Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com> (cherry picked from commit 6f63a544ae61980bd209b4f6c1f0f14cbc2efab5)
2016-01-12Added a few more deply.sh arguments needed by JenkinsJonas Bjurel1-8/+53
Added arguments: -B PXE Bridge for booting of Fuel master -f Deploy on existing Fuel master -F Do only create a Fuel master -H NO Health check -S Storage dir for VM images Added checks for URI formats Change-Id: I1f5138a2058e7b3274e9acf4bbbba243a427fb96 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com> (cherry picked from commit 7f6ef57c0028e4551137ab22d8e7e3eef53ac487)
2016-01-12Small fixes to the deployment scenario framework:Jonas Bjurel2-19/+32
- Added deploy.sh -d option for dryrun. With -d + all the other mandatory arguments, deploy.sh produces ci/config/dea.yaml and /ci/config/dha.yaml with out actually deploying the stack. - Bugfix to exit with rc <> 0 if deployment fails. - Don't delete the programatically constructed dea.yaml or dha.yaml under fuel/ci/config after deploy has finished. dea.yaml and dha.yaml are needed functest, therefore these files must not be deleted after deployment has finished. They will reside in fuel/ci/config/. - Dont merge the dha-override section in deployment scenarios with the final dha.yaml unless the deployment is virtual. There is no way you can programatically override physicall resources, wireing, ipmi set-up, etc. - while you can for virtual environments. VERIFIED READY TO MERGE Change-Id: If4dedc472e07ed60071ee34c73db29f3b9c45252 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com> (cherry picked from commit c6a9f766792032a4cc84bc801e15b05a29f09e8e)
2016-01-12ONOS scenario according to wanted config file structureJonas Bjurel6-3/+642
Replaces: - https://gerrit.opnfv.org/gerrit/#/c/5999/ - https://gerrit.opnfv.org/gerrit/#/c/6003/ Description: - Onos scenarios updated with needed dea and dha overrides, no scenario specific information in other config files such dha, dea_base, dea_pod override, etc. - Added a virtual POD for Huawei-china specific needs, i.e. DNS and NTP. - Small fix in deploy-conf.py Change-Id: I85fe2fc4e9ec5fe0bc98ae7b399f2e49af6450f9 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com> (cherry picked from commit 283bf98d087afd9073632340800e745f5a8d8de2)
2016-01-08A simple method to separate configuration for base fuel, plugins, PODsJonas Bjurel30-100/+3690
and deployment/test scenarios READY TO MERGE! Replaces: https://gerrit.opnfv.org/gerrit/#/c/3995/ Abstract -------- This deployment framework relies on a configuration structure, providing base installer configuration, per POD specific configuration, plugin configuration, and deployment scenario configuration. - The base installer configuration resembles the least common denominator of all HW/POD environment and deployment scenarios (These configurations are normally carried by the the installer projects in this case (fuel@OPNFV). - Per POD specific configuration specifies POD unique parameters, the POD parameter possible to alter is governed by the Fuel@OPNFV project. - Plugin configuration - providing configuration of a specific plugin. these configurations maintain there own namespace and are normally maintained by collaborative projects building Fuel@OPNFV plugins - Deployment scenario configuration - provides a high level, POD/HW environment independent scenario configuration for a specific deployment. It defines what features/plugins that shall be deployed - as well needed overrides of the plugin config as well as the base installer-, POD/HW environment- configurations. Objects allowed to override is governed by the Fuel@OPNFV project. Executing a deployment ---------------------- deploy.sh must be executed locally at the target lab/pod/jumpserver A lab configuration structure must be provided - see the section below. It is straight forward to execute a deployment task - as an example: sudo deploy.sh -b file:///home/jenkins/config -l ericsson-1 -p pod-2 -s os_odl-l2_no-ha -i file:///home/jenkins/MyIso.iso -b and -i arguments should be expressed in URI style. The resources can thus be local or remote. Feedback -------- Please give feed-back before I'm going to far on a wrong tangent Implemented scenarios so far: ----------------------------- - os_ha - os_no-ha - os_odl-l3_ha - os_odl-l3_no-ha - os_odl-l2_ha - os_odl-l2_no-ha - os_onos_ha - os_onos_no-ha - os_kvm_ha - os_kvm_no-ha - os_ovs_ha - os_ovs_no-ha - os_kvm_ovs_ha - os_kvm_ovs_no-ha VERIFIED READY TO MERGE JIRA: FUEL-35 Change-Id: I94a9b477d8ed4ee8057c16d8f20fe543f7ecc20d Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com> (cherry picked from commit 7fd2619e0df370fa832eeff00790bcaa52dc4ffc)