aboutsummaryrefslogtreecommitdiffstats
path: root/labs
AgeCommit message (Collapse)AuthorFilesLines
2017-11-29arm-pod{5,6}: Add comments about unused ifacesstable/euphratesAlexandru Avadanii2-10/+16
Change-Id: Iddb6a9731e6db8e8f4f7e9bd5ef770202f33930c Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit de37144aae9ec5f91a71cde9d45e58195bbe4398)
2017-11-29arm-pod6: add new PDF and IDF filesting wu2-0/+326
Change-Id: Id3a1b2014e27dfaabc0e049addb80242a4adf8a3 Signed-off-by: ting wu <ting.wu@enea.com> (cherry picked from commit a278a7cfd6528f8c111efdc70ac39cf6bd8b6d1c)
2017-10-27ericsson-pod1: Add MAC addresses for eno1 ifacesAlexandru Avadanii1-5/+5
Synced with old DHA from Danube branch. Change-Id: I696638003f49bdb1a095c92fcd1440cb56c09c59 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 396a2d60671402413231f3fad056834b1166374a)
2017-10-27ericsson-pod1: Add net_configAlexandru Avadanii1-36/+81
Based on old Fuel DEA from stable/danube: eno1: # new interface index 4 - fuelweb_admin ens2f0: # new interface index 2 - public - management - storage ens2f1: # new interface index 3 - private While at it, use '|' as NIC feature separator to align with the PDF spec. Change-Id: I2f9404dd811ecc4826e7ce1d0aebded820777dd2 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit d1e3bbc31b896601c6bb5ed0f5f27473b062a1cd)
2017-10-27ericsson-pod1: add 2 nics for all serversAlexandru Avadanii1-0/+72
Change-Id: If0e7fd76850f0610bd9b899a2a4847428a5472b0 Signed-off-by: mting <dianfeng.du@ericsson.com> Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-10-26ericsson-pod1: Add IDF for Fuel compatibilityAlexandru Avadanii1-0/+34
Change-Id: Iea4e8eacaaa4b4d5f0c1c7f05d6be816fe02e0cf Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 639947e163f5788dc2e61a382fa9f3785c77cf8c)
2017-10-18lf-pod2, arm-pod5: Fuel IDF: Add network infoAlexandru Avadanii2-0/+56
Extend Fuel section of IDF with: - OS interface names, required by MCP reclass model; - NIC bus addresses, required for DPDK scenarios; JIRA: FUEL-275 Change-Id: I3e20517ec79bc4ee75e0d5a8f74628d9b1f421a8 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit c40bf667bc5d0ba51c8d90edbdcca2399b10e013)
2017-10-05lf-pod4: Align with PDF spec, minor updatesAlexandru Avadanii1-30/+66
Change-Id: I942bdb9e29997640330007dfd359e79ab8a52a3f Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 7be782a98b571c5a39c02935123967b12a023b51)
2017-10-05Merge "arm-virtual2: Drop local_env" into stable/euphratesAlexandru Avadanii1-2/+0
2017-10-05arm-virtual2: Drop local_envAlexandru Avadanii1-2/+0
Change-Id: I998c49c7f2a2437cb75f7e1223928514b4998f04 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 1c6c80fb9c37f2582f19e7dbc69dcd8aefb5fee5)
2017-10-04lf-pod2, arm-pod5: Fuel Installer Descriptor FileAlexandru Avadanii5-7/+28
While at it, quote string variables in ericsson-pod1 IDF. Now that we can determine bridge names from IDF, drop legacy "local_env" mechanism for baremetal PODs. Change-Id: I1db41cde503099352adb72d0969c1dd0f8a92a59 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 14fe92acb1006cdb01ff57a588683b5bb2f15d47)
2017-10-02ericsson-pod1: Add Fuel installer descriptor fileAlexandru Avadanii1-0/+12
Change-Id: I654e887a6247f77fec7ee49cf042f0e9fc608816 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 787d597277811cc2abddea46e1af9b6e4dfb3e45)
2017-09-28arm-pod5: Fix node-5 MAC orderAlexandru Avadanii1-2/+2
node-5 MAC order was reversed, leading to deploy failures in Armband. Change-Id: Iae234753f1b2e51bcbc4d898a2ce92525ec67c5f Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 639f8283f3c1063474db10eefb97bcd6ed66aaf5)
2017-09-27arm-pod5 align with latest PDF specGuillermo Herrero1-30/+50
Change-Id: I1ae0f356b11cb22be7b32ead2877c0a8e19b9093 Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com> (cherry picked from commit cc0472553247aabcade20449c0a8731cb8f77ddd)
2017-09-27lf-pod2: Pod Descriptor FileAlexandru Avadanii1-0/+226
[Alexandru.Avadanii@enea.com] - this is almost completely Guillermo's work, I am just submitting it on his behalf; JIRA: FUEL-275 Change-Id: I58bda061695f4dec5cfa390ca069353c29b13e73 Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com> Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit d5f26dfb8c08c0c919fff87c5f5bc96c82ebffef)
2017-09-26PDF: Fix yamllint warnings & fold reusable codeAlexandru Avadanii5-180/+45
- ericsson-pod{1,2}: Fold node, disk params; - lf-pod4: Jump server uses same disk params; - zte-pod{2,3}: only minor formatting; Change-Id: Ib280aca93f9d6ab1768afa369b922c71485cf79c Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit a9aeec02c2c649b01ef9aad20c0c89f723a1f356)
2017-09-25lf-pod4: Add missing IPMI user/passAlexandru Avadanii1-0/+2
Change-Id: Ica0fce731f737ae3ef02e52094b81475d0c66891 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit e1c417fc5c76110321ad503644995f95e56616d4)
2017-09-25cleanup: fuel: Remove obsolete reap, dea, dhaAlexandru Avadanii36-5851/+0
Old Fuel (up to and including Danube release) relied on a DEA/DHA pair of configuration files, usually constructed based on information collected from a manually deployed POD using a "reap" procedure. Starting with Euphrates, Fuel will use the PDF as input, so DEA/DHA, as well as reap data are now obsolete. Some PODs (arm-pod5, lf-pod2) still have a "local_env" configuration file, which is a leftover from old Fuel, but can only be dropped after Fuel automatically detects the jumphost bridge names (either by matching the IP addresses on the jumphost to the networks in PDF, or by using a static mapping defined in a PDF companion file, e.g. IDF). Remove all obsolete configuration, including useless directories. Change-Id: I9eae2067d83347409c17126aadb19e3d6b95d4b6 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit f431509110f5c820a5b458e61d086d2fcc61a83a)
2017-09-22arm-pod5: Fix yamllint warningsAlexandru Avadanii1-21/+21
Change-Id: I302b014241bd1fa71e029fcd5b5905b0b1112fd5 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 1df17a3f01af616e0930f4e225c1662ce5682319)
2017-09-22arm-pod5: Fix duplicate MAC addressesAlexandru Avadanii1-2/+2
Change-Id: I3664d50a1510e2697c570adcf89cff9d1ea7961f Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 213e7c4bf2ee28c483ecc5d795459ee40712ff58)
2017-09-22arm-pod5: Fix MAC copy-paste typoAlexandru Avadanii1-1/+1
Change-Id: I01c54ebdded9d2aaa4142078699a9a65ffe652fd Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 9e66d687d0cf5f4f313428e8261018e5bb11e630)
2017-09-22labs: PDF: s/pod owner/pod_owner/gAlexandru Avadanii6-6/+6
Change-Id: Idc72cc6c0c8f13410adbb3478f811a8ee8563223 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit fe7a758541590ee51b6fbf95534163532568bbca)
2017-09-21Merge "arm-pod5: updated admin network / jumphost ipmi"Alexandru Avadanii1-11/+11
2017-09-21arm-pod5: updated admin network / jumphost ipmiGuillermo Herrero1-11/+11
Change-Id: Id337c53d94ad52266db8f7419a61d7f2f2e8c300 Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
2017-09-19lf-pod4: Fix yamllint warningsAlexandru Avadanii1-9/+8
- align comment start, end; - s/pod owner/pod_owner/ (not a problem, but breaks syntax highlight); - remove 'os' param from lfpod4-node1; Change-Id: I6c61b3a45da390f5db14c4d81f6a7d430fbe8128 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-09-14Support daisy on zte-pod3Alex Yang4-1/+213
Change-Id: I4bdf8a4a083d5731849aef40473eec2198d3a9b2 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-09-11Merge "correct lf pod4 fixed_ips"Aric Gardner1-9/+9
2017-09-08arm-pod5: descriptor fileGuillermo Herrero1-0/+183
JIRA: ARMBAND-292 Change-Id: I33443a8496bfe8a24266ffe99f6562cded88436c Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com> Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
2017-09-06correct lf pod4 fixed_ipsBlaisonneau David1-9/+9
Change-Id: I2b413c239698258cd4dfb521441408513670c855 Signed-off-by: Blaisonneau David <david.blaisonneau@orange.com>
2017-08-28Merge "Proposition to add a network descriptor in the pdf file"Aric Gardner1-0/+168
2017-08-24Correct typos to avoid failure in jenkins-ci checkBlaisonneau David6-39/+39
Change-Id: I2e8b789cbc10def76a1b7ee673bc1ca6d7f4137f Signed-off-by: Blaisonneau David <david.blaisonneau@orange.com>
2017-08-24Proposition to add a network descriptor in the pdf fileJulien1-0/+168
linked with patch 36297 Add a network descriptor in the file. The network descriptor contains what is in the wiki Each network is linked to an interface number, who refer to an interface on each server. Each nodes, list only mac addresses that are used, and plugged, in order Each nodes can specify ip addresses for each interfaces, it is optionnal depending on installer choice This solution split network definition and node definition that contains only physical informations Updated this patchset to fix typos we could rename the net_config names to be less openstack specific But I don't think it hurts and deploying openstack is a major usecase. Change-Id: I27f4a56db0e50436f5c59e1645b6d2c4c9b8ae5c Signed-off-by: Blaisonneau David <david.blaisonneau@orange.com> Signed-off-by: agardner <agardner@linuxfoundation.org> Signed-off-by: Julien <zhang.jun3g@zte.com.cn> Signed-off-by: Blaisonneau David <david.blaisonneau@orange.com>
2017-08-23arm-{pod5,virtual2}: local_env: drop obsolete variablesCharalampos Kominos2-2/+0
Change-Id: I0146d6f28796c5af69d9acad08d446af333296f6 Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
2017-08-17arm-pods: Remove obsolete pods and config filesAlexandru Avadanii9-1317/+0
- arm-pod1 was dismembered; - arm-pod2 will be restored later after the jump server is replaced; - arm-pod3 becomes arm-pod5, remove old Fuel specific config; Change-Id: Ia1d087a38583e8f3963f4f2aa2e903240e7df099 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-17arm-{pod3,virtual2}: Openstack public net rangeAlexandru Avadanii2-3/+4
While at it, update arm-pod3 local_env with MCP specific config. Change-Id: I328ac0dab3095b4d47f2d91ebd74a52a20f5b983 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-17fuel: lf-pod2: Add local_env configuration fileAlexandru Avadanii1-0/+1
This file provides pod-specific enviroment variables that will be passed down to Fuel's `ci/deploy.sh` script. Change-Id: I7e3a5ebf9a30a31b7d4bd7d7dc9a13f7c45e2c6d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-07-26arm-virtual2: Update DEFAULT_BRIDGE for MCPAlexandru Avadanii1-1/+1
Change-Id: I6cd8df7d1866297fe125727166cdad72e0a64d0f Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-07-24arm-virtual2: export LIBVIRT_DEFAULT_URIAlexandru Avadanii1-0/+1
Change-Id: Ic88f9ab032db65fe0f4390b861b618ecb2ee86ba Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-07-19arm-virtual2: Add local_env with bridge infoAlexandru Avadanii4-447/+1
While at it, remove obsolete arm-virtual1 local_env configuration, as well as old Fuel configuration for arm-virtual_kvm. Change-Id: I17aab716a33c0ceca993b2cfb552a240e691bec7 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-07-18arm-pod2: IPMI: Use secondary IP for ipmi2snmpAlexandru Avadanii1-5/+5
Our ipmi2snmp proxy uses 2 IPs, use the secondary one since the primary is now unreachable. Change-Id: I3fda960758f68c6ba8b0f31620f7639e6bfa5e1d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-07-07enable HA deployment in zte-pods for daisyAlex Yang6-51/+64
Change-Id: I0e72702540309b70afcd752b6f6442218fbf9d75 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-06-26Modify zte-pod2 to non-HA temporarily for test with daisyAlex Yang1-6/+6
Now there are some issues in HA function in daisy. The pod will be set to HA again when these issues fixed. Change-Id: I79046448641ddd18e72c9c9dd5f65e9535764824 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-06-13arm-pod2: Fix IPMI2SNMP Remote hostsCatalina Focsa1-5/+5
Change-Id: I3ebbfabd45710ea568e559684edbca77f281db8b Signed-off-by: Catalina Focsa <catalina.focsa@enea.com>
2017-05-29change zte-virtual1 to be multinode deploymentSerenaFeng1-14/+31
Change-Id: I6cae2857d6e407f4570e34446833058f5ddff1e4 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2017-05-27Update the gateway info in daisy baremetal deployAlex Yang2-4/+3
1. update gateway 2. add adapter info 3. remove useless disks info Change-Id: I65f19e691680af11cbde1119776f241785b5593d Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-05-26add external_network configuration to zte-pod2SerenaFeng1-0/+2
Change-Id: I4e66c18c176faaf93dc80d2bbe829671c3f0cdec Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2017-05-25arm-pods:1,3; dea: Modify interfaces properties: MTUCatalina Focsa3-0/+32
arm-pod2: check 8826cffe65acf34822a9ed4665267f4de6dc65ca arm-pod1, arm-pod3, virtual_kvm: Modify MTU value from null into 9000 for each interface belonging to each node. Values are to be merged into each fuel node dictionary by key reference. JIRA: https://jira.opnfv.org/browse/ARMBAND-199 Change-Id: Ieb80e51087d756499e0591d972aa8edd2fbabf1a Signed-off-by: Catalina Focsa <catalina.focsa@enea.com>
2017-05-25Update daisy config files according to opnfv/daisy repoAlex Yang4-42/+57
1. enable multi-nodes for zte-virtual2 2. enlarge disk sizes 3. add adapter param 4. add physical network mapping param Change-Id: I5b51e8d460a2514303b622b19bebdf10b20ff38c Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-05-19Hello, OPNFV installer projectsagardner7-262/+83
Firstly, this patchset looks a bit messy at the onset. relevant parts are installers/apex/*.j2 installers/joid/*.j2 installers/compass4nfv/*.j2 and the new verify job that runs check-jinja2.sh If you look at installers/*/pod_config.yaml.j2 you will see the network settings for apex joid and compass4nfv installers, the possible to template hard coded values have been replaced with jinja2 vales, that are populated by reading one of labs/*/*/config/pod.yaml eg: nodes: - name: pod1-node1 becomes - name: {{ conf['nodes'][0]['name'] }} In my last patchset I had ignored data already present in the pod.yaml (which is defined in the pharos spec here: https://gerrit.opnfv.org/gerrit/gitweb?p=pharos.git;a=blob;f=config/pod1.yaml ) I created by own yaml file in an attempt to figure out what all the installers needed to know to install on any given pod. this was counter productive. I have included a script (securedlab/check-jinja2.sh) that will check all securedlab/installers/*/pod_config.yaml.j2 against all securedlab/labs/*/pod*.yaml This is a first step towards having your installers run on any pod that has a pod file created for it. (securedlab/labs/*/pod[pod-number].yaml) Moving forward I would like your input on identifing variables in your installers configs that are needed for deployment but not covered by securedlab/labs/*/pod*.yaml Thanks for your time and feedback Best Regards, Aric Change-Id: I5f2f2b403f219a1ec4b35e46a5bc49037a0a89cf Signed-off-by: agardner <agardner@linuxfoundation.org>
2017-05-19Merge "add pod descriptor file for ericsson pod1"Aric Gardner1-0/+275