aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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: Run YAML Linter on pod descriptors / outputAlexandru Avadanii1-5/+13
We have 2 rounds of YAML files: - PDF (input file(s) for the installer adapter templates); - parsed PDF (output file(s) after installer adapter template parse); Run yamllint on all these files, and summarize the output in a tuple form: (valid YAML output, successful parse, installer templates cnt). This helps catching various issues: - formatting issues in installer adapter templates; - missing values in PDFs (e.g. lf-pod4 IPMI credentials); etc. For now, yamllint failures for output files are non-fatal. Sample output: | PDF Verify Matrix | YAML Lint | ... | fuel | joid | | pharos/config/pod1.yaml | OK | ... | 1/1/1 | 1/1/1 | | intel/pod18.yaml | OK | ... | 1/1/1 | 1/1/1 | | arm/pod5.yaml | OK | ... | 1/1/1 | 0/1/1 | | lf/pod4.yaml | OK | ... | 0/1/1 | 0/1/1 | Change-Id: Id598da89fab0e7e41641649833471194e8d248a9 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 791cb3f2d864c1f8b9473f9ba4348c4435aa813b)
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-26[fuel] Sync adapter template with Pharos versionAlexandru Avadanii1-55/+104
Change-Id: I6f3ea5e2103ae75d96834d8317cc3c505d01e45b Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit e9520de1dd8075a53745b8b88c54b96b5a7581eb)
2017-09-25check-jinja: Suppress PDF output loggingAlexandru Avadanii1-2/+16
Change-Id: I92bb9302abb74f5a58b6c10144dbe8d24d188938 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 94026d10f5146d93871efb3e65b2e59897edbbfb)
2017-09-25check-jinja2: Fix unsupported '-e' arg for columnsAlexandru Avadanii1-1/+1
Change-Id: Id5827b2f260af215731ea819a9ffc6177648f788 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 43f10d006466459d0b1843c80311543db00ae664)
2017-09-25PDF: Add result summary to check-jinja2Alexandru Avadanii1-7/+33
Apart from Pod Descritpro Files for OPNFV PODs, also validate the Pharos PDF template itself. While at it, fix shellcheck warnings. Sample output: | PDF/Installer | apex | compass4nfv | daisy | joid | | pharos/config/pod1.yaml | 1/1 | 12/12 | 1/1 | 1/1 | | intel/pod18.yaml | 1/1 | 12/12 | 1/1 | 1/1 | | orange/pod1.yaml | 0/1 | 4/12 | 0/1 | 0/1 | | arm/pod5.yaml | 1/1 | 12/12 | 1/1 | 1/1 | | ericsson/pod1.yaml | 1/1 | 12/12 | 1/1 | 1/1 | | ericsson/pod2.yaml | 1/1 | 12/12 | 1/1 | 1/1 | | lf/pod4.yaml | 1/1 | 12/12 | 1/1 | 1/1 | | zte/pod3.yaml | 1/1 | 12/12 | 1/1 | 1/1 | | zte/pod1.yaml | 1/1 | 12/12 | 1/1 | 1/1 | | zte/pod2.yaml | 1/1 | 12/12 | 1/1 | 1/1 | Change-Id: Iba46a7cc62c80ccb987879ce94ffe5f0bbb23304 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 5555a6edb45683270a8f2935cd9aa845457e9bc7)
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-24[fuel] Refresh installer adapter, sync with pharosAlexandru Avadanii1-89/+58
Change-Id: Id8e184458fe6dfaec3127195cfb865cd9fdabb9f Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 067568f1a4449fbfd07c608d7504c9ec48a07334)
2017-09-23[fuel] adapter: align IPs with recent Fuel changesAlexandru Avadanii1-7/+6
Change-Id: I44f63fb7f9e4398a16e1d0b897a2491a60bb1727 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 45ff23c696aff6584a29d7cf7398e130b3858405)
2017-09-22[fuel] Added mcp installer adapter templateGuillermo Herrero1-0/+97
Change-Id: Ide977ef48a6339631e2e3cb6fdbacc88a639c0aa Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com> (cherry picked from commit 839847df12d65d82b562c859a5813e58064fe6a6)
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-19Merge "Use pharos submodule for PDF validation"Jack Morgan3-4/+9
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-18Use pharos submodule for PDF validationAlexandru Avadanii3-4/+9
Depends-on: Ic4bd75e1b2dc339c15cd4943dfc5a1c74c68b094 Change-Id: I9d6807f3d24cee8d9a03955112a8c179d9ea7d14 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-09-17utils/generate_config.py: Add dpkg_arch filterAlexandru Avadanii1-0/+17
PDF populates the canonical arch name, as reported by $(uname -m). In some cases, we need to pass the architecture read from PDF to software components that expect it to be represend in DPKG format (e.g. MaaS, APT on Debian systems use "amd64" instead of "x86_64"). Change-Id: I5fcef0a2c2a5cdc5332b5fab1fd284386bb865d0 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-09-16utils/generate_config.py: Add ipaddr_index filterAlexandru Avadanii1-0/+13
v5 -> v6: - IP address can be IPv4 or IPv6; - add fallback to 'str' type for py3-incompatible 'unicode'; - fix pylint complaints (silence unnecessary ones); Change-Id: Iea1049a7f5379e9bcb4b785fdd810b67f51c94ab Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com> Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-09-16generate_config: Replace print statement with fcAlexandru Avadanii1-9/+9
Fix py3 compatibility by using 'print' function instead. While at it, fix constant names reported by `pylint` as invalid. Change-Id: I73e3a370560c038a8814db9758b13026dc4c0b42 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-10Merge "Make daisy template compatible with lf-pod4"julien zhang1-0/+4
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-08Make daisy template compatible with lf-pod4Alex Yang1-0/+4
Now the daisy template is not compatible with lf-pod4, see [1]. The meaning of 'interfaces' in this pod is different with other pods. Make daisy template compatible with it. [1] https://build.opnfv.org/ci/job/validate-jinja2-templates-master/80/console Change-Id: I29058f705bab333c48614b7eab8c8b9e83b9e1cb Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
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 David17-211/+211
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-31Get MAC addresses to help daisy to distinguish the discovered hostsAlex Yang1-0/+10
JIRA: DAISY-42 JIRA: DAISY-56 Now the deploy script cannot distinguish the discovered hosts, then the roles are assigned to hosts randomly. The MAC addresses of hosts can help daisy to assign roles correctly. Change-Id: If413ad776706eb4e25db5223917a7518d856ba8e Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-07-26arm-virtual2: Update DEFAULT_BRIDGE for MCPAlexandru Avadanii1-1/+1
Change-Id: I6cd8df7d1866297fe125727166cdad72e0a64d0f Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>