summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-01-22[fuel] Fix missing EOL after yaml doc startAlexandru Avadanii1-1/+1
Fixes: 4cef6b2 Change-Id: I628ce8da7e0959ff916082c1fc30934dca0d93dc Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-22Merge "[PDF] check-jinja: Filter-out incompatible PDF/IA"Alexandru Avadanii1-0/+18
2018-01-22Merge "[fuel] Add support to use public net netmask from IDF"Alexandru Avadanii1-1/+7
2018-01-22Merge "generate_config: Add netmask jinja filter"Alexandru Avadanii1-0/+10
2018-01-22Merge "update BII pod1 PDF for Euphrates install"Alexandru Avadanii2-120/+240
2018-01-22Merge "[apex] Use node remote_management params"Aric Gardner1-15/+15
2018-01-22Merge "check-jinja: Add optional filtering of test matrix"Alexandru Avadanii1-2/+11
2018-01-22Merge "Nokia public lab Pod Descriptor File"Alexandru Avadanii1-0/+243
2018-01-22Merge "[PDF] config: Add/update license headers"Aric Gardner23-18/+53
2018-01-22Merge "arm-pod7: add new PDF and IDF files"Alexandru Avadanii2-0/+320
2018-01-22update BII pod1 PDF for Euphrates installlouie.long2-120/+240
- add licenses in all PDF file - add jumphost bridge in idf-pod1.yaml - add network info in idf-pod1.yaml - use eyaml decrypt IPMI user/passwd - update node network&node name in pod1.yaml Change-Id: Ia239d5d1ac261cc8b6e35dee6af8292b60884f0b Signed-off-by: louie.long <longyu805@163.com>
2018-01-20[fuel] Add proxy node management network VIPAlexandru Avadanii1-0/+1
Change-Id: I5fd74163cab8f6ee5f575ed72edfcc6919e60161 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-20[fuel] Update MaaS PXE configAlexandru Avadanii1-3/+3
- reduce DHCP range to silence a dummy MaaS warning about address exhaustion; - define PXE/admin address for Salt Master node; - drop obsolete opnfv_infra_maas_pxe_address; JIRA: FUEL-316 Change-Id: Ic946960aac3c09dbcfce005098a5fc97396da01e Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-19check-jinja: Add optional filtering of test matrixAlexandru Avadanii1-2/+11
When adding new PDFs, it is sometimes useful to check only the newly added PDF (or all the PDFs for a specific lab) against all or only some installer templates. Change-Id: I1d02943527597df1e1908a3ff4398bc398c887e7 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-19arm-pod7: add new PDF and IDF filesting wu2-0/+320
- net_config is moved to IDF file; - rename 'disk' to 'disks'; - add 'name: nicN' to interface; - add 'disk_rotation: 0' for ssd drivers; Change-Id: I1ea91a65abeb9db4f2f73f25ce51cd059b4b4753 Signed-off-by: ting wu <ting.wu@enea.com>
2018-01-19[fuel] Add support to use public net netmask from IDFGuillermo Herrero1-1/+7
- New reclass params for public network and public network mask - Network mask is converted from prefix format to reclass compatible IP format - New reclass params to set public pool ip range JIRA: FUEL-315 Change-Id: I30c5332b958796af5a10cd39c56ed5cf5800e029 Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
2018-01-19[apex] Use node remote_management paramsAlexandru Avadanii1-15/+15
Previously, we relied on jumpserver IPMI user/pass/type to be the same for all nodes (including jumpserver). Instead, read node-specific params and stop relying on 'remote_params' optional YAML anchor. Change-Id: Id64a0c4350481a6c81212a4559115bb9b1a0155e Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-18generate_config: Add netmask jinja filterGuillermo Herrero1-0/+10
- Add custom filter to convert integer prefix network mask to IP format network mask string Change-Id: I13d6a2725b93132f858b64d7f93de3a4e0dc5961 Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
2018-01-18Nokia public lab Pod Descriptor FileMika Rautakumpu1-0/+243
Comment lines removed, typos fixed and missing fields added. Change-Id: Ic027544b2e7e70fb7c02452945fb2a1252417ce3 Signed-off-by: Mika Rautakumpu <mika.rautakumpu@nokia.com>
2018-01-16Merge "Committers standing down"Jack Morgan1-3/+0
2018-01-16Fix daisy gateway generated by PDFAlex Yang1-1/+1
Fixed_ips were removed from the PDF. So we need get gateway address from the 'interfaces'. Change-Id: Ie6adbf4ef3cbde05bb2fb114a58395dda8ae50fb Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2018-01-16[PDF] check-jinja: Filter-out incompatible PDF/IAAlexandru Avadanii1-0/+18
While checking all PDFs against all installers, some mandatory requirements are sometimes not met: - minimum cluster nodes (e.g. Apex requires 5 nodes, 1 PDF has 3); - minimum interface count (e.g. Compass requires min 3 NICs, some PDFs only have two interfaces or less); The added filter is far from ideal: - node requirements are based on the latest (not highest) index used by the installer adapter to accomodate special handling of 3-node cluster in Daisy templates; - interface req is based on the average interfaces/node, with quite some margin - this is a very loose mechanism; With this in, `check-jinja` has a return code of 0 (note that yamllint failures of output files are not affecting the return code). Change-Id: I43ade3567bf3026069ff93eca17abc212fab211c Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-15Merge changes from topics 'pdf-spec-update', 'pdf-schema'Aric Gardner5-7/+253
* changes: [PDF] [SPEC] disk_interface: Add 'scsi', 'iscsi' [PDF] [SPEC] Align interface keys for NIC names [PDF] [SPEC] Extend disk_rotation enum with '0' [PDF] Add schema validation
2018-01-15Merge changes from topic 'fix-pdf-spec-deviations'Aric Gardner12-124/+257
* changes: [PDF] zte-pod*: Fix spec deviations [PDF] lf-pod*: Fix spec deviations [PDF] intel-pod*: Fix spec deviations [PDF] ericsson-pod*: Fix spec deviations [PDF] bii-pod*: Fix spec deviations [PDF] arm-pod*: Fix spec deviations
2018-01-15Merge changes from topic 'move-net_config-idf'Aric Gardner21-397/+331
* changes: [PDF] Daisy, Fuel: Drop support for PDF net_config [PDF] zte-pod*: Move net_config to IDF [PDF] lf-pod*: Drop 'fixed_ips' [PDD] ericsson-pod*: Move net_config to IDF [PDF] bii-pod*: Move net_config to IDF [PDF] arm-pod*: Move net_config to IDF [PDF] Daisy, Fuel: Add support for IDF net_config
2018-01-15Merge "[PDF] check-jinja: cleanup, compact output"Aric Gardner1-16/+16
2018-01-15Merge changes from topic 'yamllint-fix'Aric Gardner23-88/+95
* changes: [PDF] check-jinja: Replace encrypted str w/ dummy [PDF] Fix yamllint issues in installer adapters [PDF] check-jinja: Disable check against template [PDF] generate_config: eyaml only encrypted PDFs
2018-01-15Add the huawei-pod1 PDF and IDFwutianwei2-0/+236
it include the information about the huawei-pod1 such as, cpu, memory, disk, interface, BMC and encrypt the ipmi user and password Change-Id: Ie93a84bc3953f7c35514813e99334adb260efed1 Signed-off-by: wutianwei <wutianwei1@huawei.com>
2018-01-14[PDF] [SPEC] disk_interface: Add 'scsi', 'iscsi'Alexandru Avadanii3-3/+3
zte-pod3 and ericsson-pod1 define their disk interfaces as (i)SCSI. Change-Id: I97945f7a41eec4e8a38de544af95ce4af82df200 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-14[PDF] [SPEC] Align interface keys for NIC namesAlexandru Avadanii2-4/+4
Jumpserver and cluster nodes use different keys for defining the NIC name ('nic' vs 'name'), switch all of them to 'name' for uniformity. Change-Id: I2d7720f5e5349ef59cf76a0e07749cfbd0d34d0b Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-14[PDF] [SPEC] Extend disk_rotation enum with '0'Alexandru Avadanii2-2/+2
ssd and nvme drives are static, so extend the list of accepted disk_rotation values to accomodate this. Use '0' so the enum can still be parsed as a numeric value. Change-Id: Ib8ef8cceb495c7eb588c68d151690747463167f5 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-14[PDF] Add schema validationAlexandru Avadanii3-0/+246
- create new YAML schema for PDF validation; - add basic python script for checking a PDF against the schema; - add bash wrapper for checking all PDFs in Pharos, to be leveraged later via a new verify CI job; Change-Id: I47e02642756b7a231138dec3d5258b100b4db72b Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-14[PDF] zte-pod*: Fix spec deviationsAlexandru Avadanii4-10/+94
- add dummy address/mac_address for jumpserver remote_management; - add 'name: nicN' to jumpserver & node interfaces; - zte-pod{2,9}: Fix disk_rotation out-of-enum: s/10500/10000/; Change-Id: I9548d48efb95226d888981e00df98db738d62d9d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-14[PDF] lf-pod*: Fix spec deviationsAlexandru Avadanii2-2/+44
- disk_rotation: 0 for SSD drives; - add 'name: nicN' to jumpserver & node interfaces; Change-Id: I98253c0402bf1a4080a9e34bea547a7b8f6fa60e Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-14[PDF] intel-pod*: Fix spec deviationsAlexandru Avadanii1-5/+5
- rename interface name key from 'nic' to 'name'; - disk_rotation: 0 for SSD drives; - details: change type to 'production' (typo?); Change-Id: I069c0fbe774f7c92acba90d434e384733264358d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-14[PDF] ericsson-pod*: Fix spec deviationsAlexandru Avadanii2-98/+44
- rename interface name key from 'nic' to 'name'; - remove empty 'address' from interfaces; - ericsson-pod2: Use proper interface features separator; Change-Id: Idde907dc1c3db2febbfb224faf8232eea42c5ad7 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-14[PDF] bii-pod*: Fix spec deviationsAlexandru Avadanii1-1/+11
- add 'name: nicN' to jumpserver & node interfaces; - fix 'pod_owner' key name; Change-Id: I6136fc066e615c226a2f57d566a2938b8f883f49 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-14[PDF] arm-pod*: Fix spec deviationsAlexandru Avadanii2-8/+59
- disk_rotation: 0 for SSD drives; - rename 'disk' to 'disks'; - add 'name: nicN' to jumpserver & node interfaces; Change-Id: I17d8e64f9b7c5b236d2494566e24bac91f1fc914 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-14[PDF] Daisy, Fuel: Drop support for PDF net_configAlexandru Avadanii2-24/+13
Change-Id: I889db9a4663f1b2740207e6c25dc8d09645a3708 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-14[PDF] zte-pod*: Move net_config to IDFAlexandru Avadanii7-121/+127
Drop 'fixed_ips', which is a leftover from early net_config implementation. To maintain compatibility with the only 'fixed_ips' consumer (Daisy), add 'address' on the first jumpserver interface to leverage Daisy's fallback path for determining the gateway. While at it, add/update copyright headers. Change-Id: I7c4cb5997e368503ab0b30903e5c0c58e13fe408 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-14[PDF] lf-pod*: Drop 'fixed_ips'Alexandru Avadanii4-50/+18
Drop 'fixed_ips', which is a leftover from early net_config implementation. To maintain compatibility with the only 'fixed_ips' consumer (Daisy), add 'address' on the first jumpserver interface to leverage Daisy's fallback path for determining the gateway. While at it, add/update copyright headers. Fixes: c01d68e Change-Id: I8dc386535a20d64593eccc9abd8ee8d1ef27decf Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-14[PDD] ericsson-pod*: Move net_config to IDFAlexandru Avadanii2-40/+36
Change-Id: Ide79f18bae20e599eeefe13f4ad2dba1f4a0207d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-14[PDF] bii-pod*: Move net_config to IDFAlexandru Avadanii2-55/+53
Drop 'fixed_ips', which is a leftover from early net_config implementation. Rework the contents of 'fixed_ips' using the standard PDF spec 'address' parameter. Change-Id: Ife2c1c4b0c97479e962a32fa7825864c94e9a80c Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-14[PDF] arm-pod*: Move net_config to IDFAlexandru Avadanii4-118/+84
While at it, drop 'fixed_ips', which is a leftover from early net_config implementation and is not currently used by the Fuel installer (only Daisy seems to use 'fixed_ips', but falls back to using 'address' of the first interface when 'fixed_ips' is not present). Keep 'address: 192.168.11' on jumpserver first interface for Daisy compatibility. Change-Id: I83455a45a2a19fde6b9fb8b7f0fa8872b1291ab0 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-14[PDF] Daisy, Fuel: Add support for IDF net_configAlexandru Avadanii2-12/+23
- support net_config in either of PDF or IDF files; - later, we'll remove support for PDF net_config after all PDFs have been handled; Change-Id: Iea6351831f7dcd011587ae44f04f3c5973d8135a Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-14[PDF] config: Add/update license headersAlexandru Avadanii23-18/+53
This only covers the `config` subdir. Change-Id: I1fb9470e216cc2de9a4ac91de44d99e7044e708e Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-14[PDF] check-jinja: cleanup, compact outputAlexandru Avadanii1-16/+16
The Pharos git repo already has a CI verify job for `yamllint`-ing the PDF files (check-jinja input yaml), so drop that check and keep linting only output YAML files. While at it, slightly rework the output log to make it easier to read. Change-Id: I2e47902d71514709eb48432f87d6ce68fb795d73 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-14[PDF] check-jinja: Replace encrypted str w/ dummyAlexandru Avadanii1-1/+3
During PDF validation using `check-jinja.sh`, most if not all encrypted strings will fail to decrypt due to missing keys on the build server. The templater will fallback to using raw plaintext, leading to `line too long` yamllint violations. Since we don't care about the actual value of the unencrypted string, replace the encrypted one with a dummy (shorter) string. Change-Id: I0f96db0e055bf84ad43a1df4a0f2bd86cc50fd22 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-14[PDF] Fix yamllint issues in installer adaptersAlexandru Avadanii21-81/+82
Although current YAML files in Pharos are all valid according to yamllint, the resulting YAMLs after PDF/IDF + IA interpolations still have a lot of violations, which need to be addressed. PDF changes: - bii/pod1: + fix typo in disks_A reference; IDF changes: - replace empty strings with `~` keyword (will be expanded to 'None'); IA (installer adapter) changes: - apex: + add missing document start; - compass4nfv: + too few spaces before comment; + missing starting space in comment; + replace '\t' with spaces; - daisy: + None; - fuel: + check conf.idf is defined first (fix parse for PODs without IDF); + move document start outside conf.idf condition - joid: + None; This is not an exhaustive change, some yamllint issues are still there but require either refactoring IAs or changing the PDF/IDF files in a way that needs the respective maintainer's input. Change-Id: I26743e265217e892b6a94de96a016c295ea24fb5 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-14[PDF] check-jinja: Disable check against templateAlexandru Avadanii1-1/+1
config/pdf/pod1*yaml files are not valid PDFs, but only templates. Trying to expand said files against installer adapters would lead to funky results, since most fields are expressed as '{val1|val2}' in the template files. Change-Id: Ieec4d596d0b5246aa506239183a31463951403e7 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>