summaryrefslogtreecommitdiffstats
path: root/deploy
AgeCommit message (Collapse)AuthorFilesLines
2016-01-14Merge "Removing CPU specification from Templates"Jonas Bjurel6-162/+0
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>
2016-01-13Removing 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
2016-01-12VLAN Segmentation scenarios needed for virtual traffic classifierJonas Bjurel3-0/+248
Change-Id: I2a42cff6f128bc0faca40bd6576c52282e66c0f4 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.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>
2016-01-11Small 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>
2016-01-10ONOS 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>
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>
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
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-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>
2015-12-07Change network config for LF-POD2 to match the current jumphost management ↵jose.lausuch1-12/+12
interface. Change-Id: Ia9b65ee67e7972a7def8c38a71f7fed212c68e60 Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
2015-11-30Moved the noha virtual templatesStefan K. Berg10-0/+1242
This will complete the restructuring of the Fuel repo. Change-Id: If2029617dca872741d6108362a7315833ae62c4e Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2015-11-27Restructcture of the directory layoutJonas Bjurel53-0/+8278
Restructure of the directory layout due to move of Fuel into it's own repo JIRA: FUEL-85 Change-Id: I3647e1992a508f29dce06a5d6c790725c527f6f5 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>