aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-09-27arm-pod5 align with latest PDF specGuillermo Herrero1-30/+50
Change-Id: I1ae0f356b11cb22be7b32ead2877c0a8e19b9093 Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
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>
2017-09-26Merge "PDF: Fix yamllint warnings & fold reusable code"Alexandru Avadanii5-180/+45
2017-09-26[fuel] Updated adapter templateGuillermo Herrero1-5/+8
Change-Id: Ibda422d7b4042e9b2e6c54eae66bd76f1cde0a1e Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
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>
2017-09-26check-jinja: Suppress PDF output loggingAlexandru Avadanii1-2/+16
Change-Id: I92bb9302abb74f5a58b6c10144dbe8d24d188938 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
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>
2017-09-25Merge "PDF: Add result summary to check-jinja2"Aric Gardner1-7/+33
2017-09-25PDF: 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>
2017-09-25Merge "lf-pod4: Add missing IPMI user/pass"Aric Gardner1-0/+2
2017-09-24cleanup: 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>
2017-09-24lf-pod4: Add missing IPMI user/passAlexandru Avadanii1-0/+2
Change-Id: Ica0fce731f737ae3ef02e52094b81475d0c66891 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-09-25[fuel] Refresh installer adapter, sync with pharosAlexandru Avadanii1-89/+58
Change-Id: Id8e184458fe6dfaec3127195cfb865cd9fdabb9f Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-09-24PDF: 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>
2017-09-24[fuel] adapter: align IPs with recent Fuel changesAlexandru Avadanii1-7/+6
Change-Id: I44f63fb7f9e4398a16e1d0b897a2491a60bb1727 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-09-22[fuel] Added mcp installer adapter templateGuillermo Herrero1-0/+97
Change-Id: Ide977ef48a6339631e2e3cb6fdbacc88a639c0aa Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
2017-09-22arm-pod5: Fix yamllint warningsAlexandru Avadanii1-21/+21
Change-Id: I302b014241bd1fa71e029fcd5b5905b0b1112fd5 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-09-22arm-pod5: Fix duplicate MAC addressesAlexandru Avadanii1-2/+2
Change-Id: I3664d50a1510e2697c570adcf89cff9d1ea7961f Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-09-22arm-pod5: Fix MAC copy-paste typoAlexandru Avadanii1-1/+1
Change-Id: I01c54ebdded9d2aaa4142078699a9a65ffe652fd Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-09-21labs: PDF: s/pod owner/pod_owner/gAlexandru Avadanii6-6/+6
Change-Id: Idc72cc6c0c8f13410adbb3478f811a8ee8563223 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
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>
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-07-03Merge "Use POD descriptor file in daisy"Zhijiang Hu1-0/+37
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-22Use POD descriptor file in daisyAlex Yang1-0/+37
Change-Id: Ie043eb252e2bfdbf42f1403b218958190a1070a8 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>