summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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>
2018-01-14[PDF] generate_config: eyaml only encrypted PDFsAlexandru Avadanii2-5/+9
Silence misleading warnings about failed decription for PDFs that do not use this feature. While at it, print yamllint version used by check-jinja.sh. Change-Id: Ica1ff90abaee8c9bb20996899c8f0a7527133618 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-14Merge "support gen DHA/NETWORK yaml by pdf"julien zhang4-109/+234
2018-01-12[PDF] lf-pod{2,5}: Revert IPMI creds to plaintextAlexandru Avadanii2-40/+4
LF PODs IPMI user/pass was previously encrypted with the wrong key, switch them back to cleartext. Change-Id: Iccd106b60d2051acf7d928205bd2f6ae3f256884 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-12[PDF] arm-pod6: dos2unix IDF to fix yamllintAlexandru Avadanii1-46/+46
JIRA: PHAROS-298 Change-Id: Ied56d4e1fdf09d3361de5aae64088e65cb5125ad Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-10Merge "[fuel] add main check for idf.fuel"Guillermo Herrero1-114/+114
2018-01-10[fuel] add main check for idf.fuelGuillermo Herrero1-114/+114
- Installer adapter will check first if POD idf has a fuel section. If not it will just generate and return an empty set - While at it, jinja2 code was simplified to dot syntax Change-Id: Ie040b1263ccae083e20cc57435639453d2456426 Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
2018-01-10Merge ".yamllint: Add initial config based on releng"Aric Gardner1-0/+8
2018-01-10support gen DHA/NETWORK yaml by pdf001845324-109/+234
Change-Id: I8e0d88da016801e7997b4cdf870e2d11b4fca80a Signed-off-by: 00184532 <lu.yao135@zte.com.cn>
2018-01-10Merge "PDF is not to contain net_config"Alexandru Avadanii4-70/+143
2018-01-09Merge "Fix First MAC Address on LF-POD5 Jumphost"Trevor Bramwell1-1/+1
2018-01-10.yamllint: Add initial config based on relengAlexandru Avadanii1-0/+8
Change-Id: I5a22a186d87a2389e637771628e0a7d0522b7b77 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-08Committers standing downJack Morgan1-3/+0
I am removing the following committers who are standing down.. Jose Lausuch Morgan Richomme Wenjing Chu Change-Id: I1cc451cc9a4c4598262ce913a1b34a2a656b9d61
2018-01-09Merge "nominate Trevor Bramwell as a Pharos committer"Jack Morgan1-0/+1
2018-01-08nominate Trevor Bramwell as a Pharos committerJack Morgan1-0/+1
I would like to nominate Trevor Bramwell as a committer to the Pharos project. Trevor has been an active contributor to the Pharos project over the last few months. Please provide a +1/-1 vote before the end of next week, Dec. 31st Change-Id: I8c7d09e67a86c814bb89beac878da74a03bdd1c4
2018-01-08nominate Aric Gardner as a Pharos committerJack Morgan1-0/+1
I would like to nominate Aric Gardner as a committer to the Pharos project. Aric has been an active contributor to the Pharos project over the last few months. Please provide a +1/-1 vote before the end of next week, Dec. 31st Change-Id: Ia381c93bd46053891195f8740d43cd4b010bef42
2018-01-09Merge "nominate Parker Berberian as a Pharos committer"Jack Morgan1-0/+1
2018-01-09Merge "nominate Guillermo Herrero as a Pharos committer."Jack Morgan1-0/+1
2018-01-09Merge "nominate Alexandru Avadanii as a Pharos committer "Jack Morgan1-1/+1
2018-01-08Fix First MAC Address on LF-POD5 JumphostTrevor Bramwell1-1/+1
Change-Id: Ibdf3ea886fcfca8246cd8cb24d52d12b689a733b Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-01-08Merge "PDF: Fix recurring typo in 'haswell' name"Aric Gardner6-11/+11
2018-01-06Fix the VIP of daisyAlex Yang2-2/+8
VIP can not conflict with the address of any node. Otherwise the deployment will fail. See [1]. [1]: https://build.opnfv.org/ci/job/daisy-deploy-baremetal-daily-master/359 Change-Id: I53a79c478d355d00b6eec16c462694eab68292d7 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2018-01-03Add admin external network mapping for daisyAlex Yang2-0/+8
The admin external network mapping is used by post deploy script in daisy to create network. Change-Id: I4bdde9ca52d8932f77e91b8bf7d41b0c2e821a20 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-12-27PDF: Fix recurring typo in 'haswell' nameAlexandru Avadanii6-11/+11
Fix typo before it gets propagated even more: $ grep hasewell -Rl . | \ xargs sed -i 's/hasewell/haswell/g' Change-Id: Id6a17ae8f429946f7febba6f319a25759fc8339f Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-12-22nominate Alexandru Avadanii as a Pharos committer Jack Morgan1-1/+1
I would like to nominate Alexandru Avadanii as a committer to the Pharos project. Alexandru Avadanii has been an active contributor to the Pharos project over the last few months. Please provide a +1/-1 vote before the end of next week, Dec. 31st Change-Id: I192c87b6a36b2981cdfb4c780bd1fff9152201a8
2017-12-20Merge "modify admin network segment of zte pod1"Aric Gardner1-1/+1
2017-12-20PDF is not to contain net_configagardner4-70/+143
Moved net_config from PDF to IDF for discussion on what the idf should look like The PDF spec is static and should not change. All changes needed for installers should be put in other descriptor files. (senario and installer descriptor files) Change-Id: I79f6c751cabc69bded255ce0471e8512c656c259 Signed-off-by: agardner <agardner@linuxfoundation.org>