summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-01-29Ignoring pyc and eclipse filesNikolas Hermanns1-5/+5
Change-Id: I6883c45b805ba52ed485c634300c86652c9cb9e0 (cherry picked from commit 516e97efb5a47e6e2b88f1b237f3f9e1c6465832)
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)
2016-01-08updates to use new doc toolchainRyota MIBU1-0/+5
Change-Id: Ic743125195c158dfb6b09b7f101f71cc71e66c2b Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>
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>
2016-01-03Update OVS PluginRuijing Guo1-1/+1
1. fix issue in https://gerrit.opnfv.org/gerrit/#/c/5179/ 2. no change for OVS without DPDK 3. add OVS with DPDK packages 4. add DPPD 5. TODO: netvirt + OVS with DPDK Change-Id: I153a95426d388d58933799e183d7b7316062e525 Signed-off-by: Ruijing Guo <ruijing.guo@intel.com>
2016-01-03upload onosfw plugin makefiledongfeng2-6/+17
Change-Id: I70f81d0ad66d559a672ca037021b4256b18a202d
2015-12-28Added Fuel plug-in builder for OVSNFVJonas Bjurel4-1/+109
JIRA FUEL-36 Change-Id: I354919bbed08dc2a449fa49334ca26d05e057676 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2015-12-25Merge "Update OVS Plugin"Ruijing Guo0-0/+0
2015-12-24Update OVS PluginRuijing Guo1-1/+1
1. no change for OVS without DPDK 2. add OVS with DPDK packages 3. add DPPD 4. TODO: netvirt + OVS with DPDK Change-Id: I5e1e0c14bea0a2c3284d572cc2ab333486d119d1 Signed-off-by: Ruijing Guo <ruijing.guo@intel.com>
2015-12-23Update KVM/QEMURuijing Guo1-1/+1
1. fix KVM/QEMU boot issue Change-Id: I967e79e5a8eb6f349ad4feb61fa9701901e2913d Signed-off-by: Ruijing Guo <ruijing.guo@intel.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
2015-12-21Move install_docker.sh to common placeRuijing Guo4-29/+2
1. copy install_docker.sh in qemu plugin to docker/ubuntu-builder 2. change docker build in ovs & qemu Change-Id: I3c0143e5e1b10a1cf798592d8bc05a49a5d12d48 Signed-off-by: Ruijing Guo <ruijing.guo@intel.com>
2015-12-21Align all plugins with new method for cache idStefan K. Berg5-6/+33
The cache tool is now responsible for returning the commit ID of a branch, tag or commit. This change was first introduced in the bgpvpn plugin and now the rest of the plugins with a need for this are also using the same method. Without this, a plugin pointing to a commit ID on master would fail to build once the head of master is updated to point to a later commit... Change-Id: I7c32d5b41871741717ae42c1334e8557f0b0bedd Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2015-12-21Created a template for installer configurationSofia Wallin1-0/+23
Change-Id: Ia47d104773987f6517eac2a198994d63c9f8122c Signed-off-by: Sofia Wallin <sofia.wallin@ericsson.com>
2015-12-21Rebased with latest upstream ONOSFW pluginJonas Bjurel2-3/+7
Change-Id: Iaa8f101380124aae3c91f75702a89ab784884072 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2015-12-20Replace ericsson-pod2 dha and dea files with the working versionsFatih Degirmenci2-63/+63
Change-Id: Ia071dd3c76a5d3fc5f8418e39f123850358a00a6 Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
2015-12-18Uplift of Docker versionsStefan K. Berg3-1/+24
The Docker version 1.5.0 is no longer allowed to acces the Docker remote image repository! Switching to version 1.7.1 instead. Change-Id: Id71cab4b26a02e98a3bb51f31caa394bcf25b7d9 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2015-12-18Fix for cache handlingStefan K. Berg2-10/+46
Introduced a separate function "getcommitid" in the cache.sh - a.k.a. $(CACHETOOL) - so that given a repo and a tag, branch or commitid the corresponding commitid is returned. The same principle should be used in all caching functions where not a strict tag or head is specified (as git ls-remote will not be able to figure out the commit id in those cases). Change-Id: I3540dca7ab408c872eaabdc68d4058f9d6d7c45f Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2015-12-17Merge "Updated Installation Instruction for FUEL B-REL WP1 (FUEL 7.0 rebasing)"Jonas Bjurel3-125/+317
2015-12-17Updated Installation Instruction for FUEL B-REL WP1 (FUEL 7.0 rebasing)Sofia Wallin3-125/+317
Updates include: - MTU Fix (JIRA FUEL-84) - Updates for FUEL config (admin pwd, HTTP proxy option) - Updates for FUEL 7.0 UI Elements - Tagged areas for updated when ODL is available in next WP - Corrected typo - Changed name installation-intruction - Changed name build-instruction JIRA: FUEL-84 replacing change: https://gerrit.opnfv.org/gerrit/#/c/3449/ Change-Id: Ib855c67e7fbe93781a4252f43f2911d9c5fa0645 Signed-off-by: Sofia Wallin <sofia.wallin@ericsson.com>
2015-12-16Bugfix fuel-plugin-bgpvpn use wrong branchjose.lausuch1-2/+2
This commit fixes the failing master build: https://build.opnfv.org/ci/view/fuel/job/fuel-build-master/80/ Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com> On behalf of Nikolas Hermanns <nikolas.hermanns@ericsson.com> Change-Id: Idd7c6cf00f9bc0792d70953d57f4c32f223d547d
2015-12-14Integration of ODL BGP-VPN pluginJonas Bjurel4-1/+106
READY TO MERGE JIRA: FUEL-48 Change-Id: Idc44966f32caf8728580bac8bcc89981f7c987ba Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2015-12-11Update QEMU/KVM pluginRuijing Guo3-1/+29
1. docker based build in qemu plugin 2. rebase to fuel 7.0 3. add kvm4nfv Change-Id: I5aceeec5e5f88b936cea43fa07db36f65e332211 Signed-off-by: Ruijing Guo <ruijing.guo@intel.com>
2015-12-11Docker based build for ovs and rebase to Fuel 7.0Ruijing Guo3-2/+29
Change-Id: I05ccabdb329dff31a52b3cd6c1b60148bee8efe9 Signed-off-by: Ling Yu <ling.y.yu@intel.com> Signed-off-by: Ruijing Guo <ruijing.guo@intel.com>
2015-12-10Add fuel templates for Ericsson Montreal Lab POD2Fatih Degirmenci2-0/+900
Change-Id: I45130cc7d3457ebafec1d9e31b95e03a10847c8f Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
2015-12-09Add fuel templates for Ericsson Montreal Lab POD1Jo¶rgen Karlsson3-0/+1034
Change-Id: Icc2f63569fd39d517ae5d29ef47839c1b6c742ba Signed-off-by: Jo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com>
2015-12-09Merge "FIX for getting all types of error log messages from ↵Daniel Smith1-1/+1
/var/log/puppet.log on nodes"
2015-12-09Merge "Refactor temporary directory creation"Daniel Smith4-4/+8
2015-12-09FIX for getting all types of error log messages from /var/log/puppet.log on ↵Szilard Cserey1-1/+1
nodes Change-Id: Id43e74fd3ebd1bd0c62e2aa963793d6b072e3fcc Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>
2015-12-09Merge "Reaping improvements for Fuel 7"Stefan K. Berg3-6/+27
2015-12-08Reaping improvements for Fuel 7Stefan K. Berg3-6/+27
In order to download the deployment information, the node id must be explicitly specified. The fuel setting commmand returns "ha_compact" as the mode for a cluster, but Fuel does itself not understand this when changing the settings - it needs to be named "ha". Added shebang for reap.py and deploy.py. Upped the default image sizes for the DHA template to match Fuel 7. Change-Id: I3ecacb83dc44454b90dedc98104658a16926dc1f Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2015-12-08Refactor temporary directory creationPeter Barabas4-4/+8
Use Python's tempfile instead of forking a shell for mktemp. Change-Id: Icba442ea08d4098d67fb51575da16e85d4363beb Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>