summaryrefslogtreecommitdiffstats
path: root/deploy
AgeCommit message (Collapse)AuthorFilesLines
2016-02-16Applying ODL changes to BGPVPN scenarioNikolas Hermanns4-0/+442
Since module substitionion does not support arrays the plugin attributes are added to the scenario file and not taken from the plugin files. In addition the bgpvpn plugin contains a fix for the instable stable/liberty branch now. Change-Id: I94ce93bbbe6596ff9417bdd8c11dc62cd2167c11 (cherry picked from commit ad8a87e29afa370207224975841420a29b408ea1)
2016-02-15Rebased NFVOVS to the new plugin archJonas Bjurel4-2/+205
Change-Id: I4eb093c2fe4208975d08ffc2477e8ff04b213afd Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com> (cherry picked from commit 6dd9f2cda829e3e86a177c7b9b5cf8ca742bf2f7)
2016-02-15Merge "Fixed deployment timeout and OVSNFV plugin build" into stable/brahmaputraJonas Bjurel1-1/+1
2016-02-15Modify README for B-releasePeter Barabas1-35/+1
Change-Id: Ib38336f6c96b073dadd1798eab3149ff268e21e2 Signed-off-by: Peter Barabas <peter.barabas@ericsson.com> (cherry picked from commit d6e56501b59d881234c6817afed93d1a44f39993)
2016-02-15Fixed deployment timeout and OVSNFV plugin buildJonas Bjurel1-1/+1
- Increase deployment timeout to 4h since some deplyments takes more than 3h (KVM) - Fixed build interference between OVSNFV and OVS-NSH where the later removed the OVSNFV build result from release/opnfv. A propper fix for SR2 is to have f_isoroot/Makefile remove the release directory before build, and not have the plugins removing anythin in release Change-Id: Ibca986554087d6a7f12ed8c7cc6fdd4919368ad2 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com> (cherry picked from commit 18d8b0bc95af3ea0ed02717af65dd4656fac8830)
2016-02-13Fixed node assignment for KVM HA scenarioJonas Bjurel1-3/+3
Change-Id: Iaffde56bb2ad691da2bdbacee38b8d60a289b8c9 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com> (cherry picked from commit 6b996b043c6a42cf97165a22eb05e19acf2614b7)
2016-02-12Fix for the KVM4NFV scenariosJonas Bjurel4-2/+371
- The qemu plugin has been rebased to the newer plugin framework vesion. The scenarios need to be rebased accordingly VERIFIED READY TO MERGE Change-Id: I4d74d1e94b12763f33d7731d5899a724bedcb0ce Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com> (cherry picked from commit e4520f628c47b37aa75e9980dcfd187199962e62)
2016-02-08Uplift scenario files to LibertyNikolas Hermanns2-2/+2
Change-Id: I4d977caadc3858b315ff8f3d0eb063bcc443ace1 (cherry picked from commit e0f9c68e20b69f19ba50f17b367c918d30c4d13c)
2016-02-05URGENT Quick-fix for scenariosJonas Bjurel1-1/+1
Change-Id: I709d5868ebe038f908b43d930117060ba1936a61 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com> (cherry picked from commit 0193ea1dbe4c8c3c097e6953f38877ce4864e96e)
2016-02-05Merge "Switching to using local package mirror for installation" into ↵Stefan K. Berg1-21/+3
stable/brahmaputra
2016-02-05Switching to using local package mirror for installationStefan K. Berg1-21/+3
Change-Id: Ic2039bfd4fe23851197e92cce060397b54c891f0 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com> (cherry picked from commit dcd792692b565be488eb4fdadb1654bf2c2161e4)
2016-02-05Increase Fuel disk size from 50 GB to 100 GBPeter Barabas1-1/+1
Change-Id: I4a5471f9b910584d6af6620bf901d6308a425bb9 Signed-off-by: Peter Barabas <peter.barabas@ericsson.com> (cherry picked from commit 161597bc99de06e4b7918120548c8d2f4fbc677f)
2016-02-04Remove patching 'netmask' from isolinux.cfgPeter Barabas1-22/+3
Change-Id: I7ba0c677b8a77b1239fcec4d0771af2b2cdddc01 Signed-off-by: Peter Barabas <peter.barabas@ericsson.com> (cherry picked from commit 62920f0ea95baf657f640d9f8f5c4f99ff8abf5e)
2016-02-04Merge "Properly clean up after SIGTERM (kill) and Ctrl-c" into ↵Jonas Bjurel1-1/+28
stable/brahmaputra
2016-02-04Correcting license and copyright terms throughout the repoJonas Bjurel12-2/+110
Please review this carefully! Strategy: 1) No strict research on copyright/who did what (if you want it changed contact the Fuel team or Jonas Bjurel) 2) Licence statements will not be added to the following file types: - Patch files or orig files for patches - Config files generated by ordinary tools, like libvirt/visrsh - GIT dierctive file - Other auto-generated files Change-Id: I48504c6f27925445dc44683a27a575bcab78d828 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com> (cherry picked from commit f9e50fa686599ff4a7e94805279820d3cdfefbc4)
2016-02-04Properly clean up after SIGTERM (kill) and Ctrl-cPeter Barabas1-1/+28
Change-Id: Ibcd9bdda9aaebfd96d32a3efbc7a53f5428b5c91 Signed-off-by: Peter Barabas <peter.barabas@ericsson.com> (cherry picked from commit fa9995ac96219f2ce519d22223bf1e17cbdc6819)
2016-02-02Increase Fuel disk sizeJonas Bjurel3-9/+9
Change-Id: I386113113a7f3d754f66c2a359ef4a5d18176f47 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2016-02-01onos change scenariodongfeng3-2/+179
Change-Id: Iaaa36203e826e1785489538f06ea1a25da373945 (cherry picked from commit dfecc5ca877e322b7a766eb4e22ea27ff76a1ddc)
2016-01-29Rebasement of Fuel8 deployment configuration files and scenariosJonas Bjurel23-311/+2002
Note: - Lab configurations removed - Most of the POD configuration files resides in the securedlab repo - The securedlab repo is very restricive, cause it carries Lab internal secrets TODO: - Ericsson virt is not yet rebased - Intel virt is not yet rebased - LF-POD2 is not yet rebased - Deployment scenarios for vsperf, NFVOVS, NFVKVM, ONOS, VSPERF, BGPVPN is not yet rebased NOT VERIFIED DO NOT MERGE Change-Id: I59d96acb26c06abf60c254fae8ea2ced332e5884 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com> (cherry picked from commit c43ed292f38dd9d26ee1efb02f0871501aa64dc9)
2016-01-29Merge "Fix wrong offset in environment array" into stable/brahmaputraStefan Berg1-1/+1
2016-01-29Fix wrong offset in environment arrayPeter Barabas1-1/+1
Change-Id: Ifd01bc89c2c73801544310f567dd0458233b3290 Signed-off-by: Peter Barabas <peter.barabas@ericsson.com> (cherry picked from commit 2ddc5c24c06afb9ebd0670fb933fec61c45f5953)
2016-01-29Fix boot parameters for Fuel 8Peter Barabas1-0/+14
Change-Id: I21a70728810571482ca2cc2264733dbca89058d6 (cherry picked from commit 4214600456bf87ca339805407a904d229ad29dc6)
2016-01-29Merge "onos-config" into stable/brahmaputraStefan Berg1-0/+24
2016-01-29Merge "Support new plugin configuration schema" into stable/brahmaputraStefan Berg1-5/+15
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-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-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-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-29OpenDaylight plugin for brahmaputra releaseMichal Skalski1-53/+71
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-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-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-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-12Small fixes to the deployment scenario framework:Jonas Bjurel1-1/+5
- 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 Bjurel28-3/+3426
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)
2016-01-06Fix noha virtual deployment templates for Erisson bladeFatih Degirmenci20-0/+2484
This change also move the noha templates into new directory structure which is proposed as a separate change with change-id I1ba1f1a7dd3951f4ce403ad2efde6a76130d533e Change-Id: I0bae0c90ae99c8eea1bc43295e727962709ecbe0 Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
2015-12-22Merge "Revert "Fix for the default virtaul enviroment template.""Daniel Smith1-3/+3
2015-12-22Revert "Fix for the default virtaul enviroment template."Fatih Degirmenci1-3/+3
We need to revert this in order to be able to run virtual deployments on Intel machine. The issue on Ericsson machine needs to be looked into after the vacation period. This reverts commit 6ffd176509318935eae6dd554a5fb70c255c6db3. Change-Id: Ia0d33bee15f127016c3fda778b4327b5877f79f0
2015-12-22Remove extra controller from Ericsson POD2 DEAFatih Degirmenci1-4/+0
Change-Id: I824e781f24a918fe724f3eb7194005cbf5962b5b Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
2015-12-22Fix for the default virtaul enviroment template.lmcdasm1-3/+3
Im not sure who / how this value was changed, but when you are doing a virtual "AUTOMATED" installation, then the value needs to remain as the FUEL VM, since in a nested environment, the idea is NOT to allow the VM's external access (only to the FUEL VM on the ADMIN network )... If you need to have a different "virtualConfiguration", the create a new subdirectory and a alternate configuration rather than the working / default template for CI for FUEL Nested Setup Change-Id: I6163307bac285d710a5a5c683798a3c20c609932 Signed-off-by: lmcdasm <lmcdasm@OPNFV-VNCSRV1.opnfvericsson.ca> JIRA: 007