summaryrefslogtreecommitdiffstats
path: root/config
AgeCommit message (Collapse)AuthorFilesLines
2018-01-22Merge "generate_config: Add netmask jinja filter"Alexandru Avadanii1-0/+10
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 "[PDF] config: Add/update license headers"Aric Gardner23-18/+53
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-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-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-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] 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] 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 Avadanii14-59/+60
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 zhang2-109/+29
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-10support gen DHA/NETWORK yaml by pdf001845322-109/+29
Change-Id: I8e0d88da016801e7997b4cdf870e2d11b4fca80a Signed-off-by: 00184532 <lu.yao135@zte.com.cn>
2018-01-08Merge "PDF: Fix recurring typo in 'haswell' name"Aric Gardner2-4/+4
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 Avadanii2-4/+4
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-20validate-pdf-jinja2-templates-master failingagardner2-4/+4
If keys do not exist, the skipping decryption python stuff doesn't work, see: https://build.opnfv.org/ci/job/validate-pdf-jinja2-templates-master/16/consoleFull Still does not fallback to plain in the case of a 'bad decryption', but the current code does not either, bad decryption is logged in any case. Change-Id: I8da2c7cf8568a6e77ca24cc9ce665410d93b7ba9 Signed-off-by: agardner <agardner@linuxfoundation.org>
2017-12-15Merge "Update the example config filename in eyaml README"Jack Morgan1-1/+1
2017-12-15Merge "Generate daisy network configuration by template"Jack Morgan2-0/+204
2017-12-15Update the example config filename in eyaml READMEAlex Yang1-1/+1
The example configuration file in the directory pharos/config/utils/ is config.example.yaml. Change-Id: I493274e4ddb689eb729ed642b5f495b5be0b75b0 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-12-13Update eyaml READMETrevor Bramwell1-1/+2
On CentOS7 systems the gem command is contained in the 'rubygems' package, not 'ruby-gems'. After the keys have been moved, there is not reason to keep around the 'keys' directory. Change-Id: I5cb9f474276de75b650ddf323a279e139fb62d37 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2017-12-11Merge "[fuel] extend public gateway support"Aric Gardner1-0/+9
2017-12-11Merge "[fuel] Add MaaS PXE network to installer adapter"Aric Gardner1-0/+5
2017-12-11Merge "[fuel] Add IDF mappings to installer adapter"Aric Gardner1-0/+7
2017-12-11[fuel] Add MaaS PXE network to installer adapterAlexandru Avadanii1-0/+5
JIRA: FUEL-313 Change-Id: I046ea732e1047f793f1b3bc6f7fc31cfcee9ff40 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-12-10[fuel] cleanup: Drop infra_compute_*_addressAlexandru Avadanii1-3/+0
Our PDF installer adapter defines 3 unused reclass params that are misleading, so drop them (infra_compute_node{01,02,03}_address). Change-Id: Iedf68bbfa77f3a42572dde30275318c8d04f5eb4 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-12-09generate_config.py: Fix running without eyamlAlexandru Avadanii1-3/+7
If eyaml is not installed or misconfigured, we should output raw encrypted data and throw a warn/error accordingly, instead of bailing out completely. Needed for Fuel deploys on PODs that do not use PDF encryption, e.g. lf-pod2. Change-Id: I2905df11a3cf2f2eb1ab9bfd8bd88619af2cab04 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-12-07[fuel] Add IDF mappings to installer adapterAlexandru Avadanii1-0/+7
Change-Id: I3a82ed747d2671510a25e65388c7f73ec760afc3 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-12-07[fuel] extend public gateway supportGuillermo Herrero1-0/+9
JIRA: FUEL-305 Change-Id: Ic5a2d499925aeec5b597394a059640ddae83fb2d Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
2017-12-07Merge "[fuel] IPMI: Trim netmask from IP passed to MaaS"Jack Morgan1-5/+5
2017-12-07Merge "[fuel] Use PXE interface index from net_config"Jack Morgan1-2/+2
2017-12-06Generate daisy network configuration by templateAlex Yang2-0/+204
JIRA: DAISY-74 Add jinja2 templates for daisy network configuration. For DPDK, TENANT and EXTERNAL networks should share the same interface now. Change-Id: I6e9b7a68fb572e9ad844cfcc6ff383aaa25e3bc1 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-11-24Jenkins does not have /usr/local/bin/ in pathagardner1-0/+1
Stupid jenkins Change-Id: Ibfd83e7dadd674cfe7d7a9c2a712ef069fb8d5de Signed-off-by: agardner <agardner@linuxfoundation.org>
2017-11-23Moving check-jinja2 to pharos.agardner1-0/+66
Securedlab will be going away now that we can encrypt strings (eyaml) we need to check jinja2 PDF templates that will be moving into pharos This adds one pod yaml files and fixes paths in check-jinja2.sh After this is merged I can create a jenkins job for pharos. Then I can start moving pdf files into the pharos repo Change-Id: I2f2f2925275de49035d7d0160249d75b25ca0d20 Signed-off-by: agardner <agardner@linuxfoundation.org>