summaryrefslogtreecommitdiffstats
path: root/docs/submodules/pharos
AgeCommit message (Collapse)AuthorFilesLines
2018-06-28Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - [arm-virtual2] Add ip-range to avoid IP conflicts Change-Id: Ib7858d57d3e0cc1a428905a63c4d342be260a673 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-06-20Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - [unh-pod1] Increase MaaS timeouts Some targets (especially 96-cores computes) in UNH POD1 take longer than the average to commission/deploy, so adjust the timeouts accordingly. Change-Id: I9bf0b2ecccb3e8437cc5659688a84ee5ad0b5b87 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-06-19Update git submodulesPaul Vaduva1-0/+0
* Update docs/submodules/pharos from branch 'master' - unh-pod1: restrict public ip range to avoid conflict Change-Id: I7644fe6eedc71b4e67ea6b6d112a06685ea26602 Signed-off-by: Paul Vaduva <Paul.Vaduva@enea.com>
2018-06-12Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "Adding reclass sections to idf-pod1 file" - Adding reclass sections to idf-pod1 file reclass section is necessary to setup hugepages size to 2M per hugepage as the defaults are 1G which are not supported by thunderx. Plus adding ntp servers to unh-pod1 Change-Id: I9cd2a8105032035a519411b80f95675a997a1fbd Signed-off-by: Paul Vaduva <Paul.Vaduva@enea.com>
2018-06-12Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - [idf.fuel] Add NTP for new virtual PODs Change-Id: I6172e909c51e796b16f62f2d8e0cb0497306ce2a Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-06-08Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "[PDF] Add arm-virtual2 PDF/IDF" - [PDF] Add arm-virtual2 PDF/IDF JIRA: FUEL-322 Change-Id: I3b136d6eebdaf0f09c772d2b994158af99cd8fea Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-06-08Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "add ericsson vpod PDF" - add ericsson vpod PDF Change-Id: I20e70ec3264e807fb85585441d51752b13f5389d Signed-off-by: mting <dianfeng.du@ericsson.com>
2018-06-04Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "[fuel] IA: Add PXE/admin static IPs" - [fuel] IA: Add PXE/admin static IPs - check-jinja2.sh: Add template dir to include dirs; - add param definitions for PXE/admin static IP for each machine, moving MaaS DHCP range start after the new addresses, similar to public network; - drop 'opnfv_' prefix for compute parameters; - drop 'opnfv_jump_bridge_*' variables (deprecated); - drop 'opnfv_infra_maas_*' variables, handled directly in Fuel now; - add 'opnfv_net_*_mask' for all used networks in idf.net_config; - move all internal j2 variables to net_map.j2, so we can reuse them without pod_config; - refactor maas variables into a full `maas.region.machines` section when baremetal nodes are defined; - drop 'openstack_compute_*' reclass params in favor of direct expansion in reclass.storage definitions via j2 in Fuel@OPNFV; - add `net_macros.j2` for reclass linux.network reclass generation; - move all non-sensitive reclass parameters to Fuel@OPNFV; Change-Id: I495c6072d845b273b6607d45dc5152ec4ee767cf Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-06-04Update git submodulesmting1-0/+0
* Update docs/submodules/pharos from branch 'master' - update ilo mac address after hw replacement Change-Id: I9df2e117d8a2036c9555ddfe41d636b9e30910e8
2018-06-04Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "[idf.fuel] Add NTP servers" - [idf.fuel] Add NTP servers Change-Id: Ib840995b085ec9d8a585d5cf2e2a84e5801875b6 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-05-30Update git submodulesGuillermo Herrero1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "IDF and PDF files for auto pod in unh lab" - IDF and PDF files for auto pod in unh lab Change-Id: Iad65abda66b772e8ed44c2257ebdb7cb48ecc6c1 Signed-off-by: joekidder <Joe.Kidder@enea.com> Signed-off-by: pava <Paul.Vaduva@enea.com>
2018-05-30Update git submodulesGuillermo Herrero1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "[IDF] arm-pod9: added as new idf and pdf" - [IDF] arm-pod9: added as new idf and pdf Change-Id: I415eda9f493fcd70514d5f9be7d58b7b6d1cb88f Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
2018-05-30Update git submodulesGuillermo Herrero1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "[IDF] arm-pod8: added as new idf and pdf" - [IDF] arm-pod8: added as new idf and pdf Change-Id: I01c678b45fd182bef8a95bdf13054a36347e057b Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
2018-05-15Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - [PDF] Preparations for vPDF support - extend check-{jinja2,schema}.sh to scan vPDFs and construct proper IDF path for vPDFs; - add support for '/' in PDF fields, by default filtered by j2 template rendering; SPEC changes: - extend remote_management 'type' enum with 'libvirt'; SCHEMA changes: - add new enum value 'libvirt' according to SPEC update; - add separate handling of 'remote_management' for baremetal/virtual; - remote_management 'versions' and 'mac_address' are mandatory for all but 'libvirt' (used to be mandatory for all); Change-Id: Ib3f711cae807c3ab27920391402ba74844f155c3 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-04-30Update git submodulesJulien1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "Okinawa Open Labratory(OOL) POD1 PDF/IDF" - Okinawa Open Labratory(OOL) POD1 PDF/IDF Change-Id: I0980de9c2ff37654dbfd2d58002b9e61226cf749 Signed-off-by: Hideyasu Hayashi <hideyasu.hayashi@okinawaopenlabs.org>
2018-04-25Update git submoduleszhihui wu1-0/+0
* Update docs/submodules/pharos from branch 'master' - update idf file for zte-pod1 Change-Id: Iffed25c5e01aa9bf2a7b4a7103b07fb1c097d811 Signed-off-by: zhihui wu <wu.zhihui1@zte.com.cn>
2018-04-18Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - [fuel] Parameterize tenant VLAN ranges - IDF: convert all tenant VLANs to ranges; - IA: convert 'M-N' to 'M:N' for `opnfv_net_tenant_vlan`; Change-Id: Ic9211235281c81ba082d10806651c35116ba4c35 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-04-12Update git submodulesagardner1-0/+0
* Update docs/submodules/pharos from branch 'master' - JOID PDF-IDF support for intel-pod18 More info in gerrit comments. Remove joid from all other idfs other than intel/pod18 add installer: ['apex', 'compass4nfv', 'daisy', 'fuel'] where missing Change-Id: I2afc415599070e210736c5fc304f7cb150f05029 Signed-off-by: agardner <agardner@linuxfoundation.org>
2018-04-12Update git submodulesGuillermo Herrero1-0/+0
* Update docs/submodules/pharos from branch 'master' - [IDF] arm-pod6: Adjust CPU pinning variables For non-dpdk scenarios we define as cpu config: 0-7 for OS 8-47 for nova For dpdk scenarios we define as cpu config: 0-7 for OS 8-11 for DPDK drivers and processes 12-47 for nova Change-Id: Ia9d7cfaee76f996993b94a52e1484752157a23cd Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
2018-03-30Update git submodulesAlex Yang1-0/+0
* Update docs/submodules/pharos from branch 'master' - [IDF] zte-pod3: Remove vlan for tenant/external To deploy ovs_dpdk scenario by daisy. In this scenario, vlan configuration is not supported on tenant/external interface for now. Change-Id: I6e91bea92bde085079f4435fa72f20b5cef12ad3 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2018-03-23Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "[IDF] arm-pod7: Configure hugepages and cpupinning variables for armpod7" - [IDF] arm-pod7: Configure hugepages and cpupinning variables for armpod7 For non-dpdk scenarios we define as cpu config: 0,1 for OS 2-7 for nova For dpdk scenarios we define as cpu config: 0,1 for OS, 2,3 for DPDK drivers and processes 4-7 for nova Dpdk config is also provided for the 3 thunderx nodes which currently serve as KVM nodes. The config is similar to the config above with cores 4-47 being used for nova. JIRA: ARMBAND-364 Change-Id: I761aa8e73935b7180f4f377841cc93c9d81cf4d7 Signed-off-by: Charalampos Kominos <charalampos.kominos@enea.com> Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
2018-03-22Update git submodulesCharalampos Kominos1-0/+0
* Update docs/submodules/pharos from branch 'master' - [IDF] arm-pod5: Configure hugepages and cpupinning variables for armpod5 For non-dpdk scenarios we define as cpu config: 0,1 for OS 2-7 for nova For dpdk scenarios we define as cpu config: 0,1 for OS, 2,3 for DPDK drivers and processes 4-7 for nova JIRA: ARMBAND-364 Change-Id: Icc976e8511fed221b71a348afda3cbe4e0556b1a Signed-off-by: Charalampos Kominos <charalampos.kominos@enea.com>
2018-03-11Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - [IDF] arm, lf, ericsson: Align IP ranges start - Enea lab has infra IPs in public networks, similar to ericsson-pod1 so start assigning public IPs from .100 onwards; - since most Fuel PODs have public (and mgmt) IPs starting at .100, align this across all PODs for uniformity; - align all mgmt networks start to .10; JIRA: ARMBAND-365 Change-Id: I9df4083c9e2e4c15da5ce6a2cb24df560808161a Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-03-07Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - [IDF, fuel] Add idf.net_config.*.ip-range support - labs: ericsson-pod1: Restrict management and public network IP ranges to exclude pre-existing infrastructe addresses; - fuel: Consume new ip-range network property in installer adapter; NOTE: For now, we only look at range start (and ignore end addr). JIRA: FUEL-351 Change-Id: If81d0214f896fd42dfd0855ae4cecb06335d2e00 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-03-07Update git submodulesBlaisonneau David1-0/+0
* Update docs/submodules/pharos from branch 'master' - LF-POD4 PDF/IDF PDF+IDF for LF POD4 inspired from securelab PDF and LF-pod2 XDFs. Change-Id: If7ee14efe5f279104a18d2a3281aa7b23bdf704a
2018-03-05Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "config/installers: Adopt j2 'do' extension" - config/installers: Adopt j2 'do' extension Change-Id: Iffc473a4c90ff4ee8cfbcc304a3462559199fbe0 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-03-05Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - generate_config: minor code formatting updates Change-Id: If0ee12287f4257f2de315bd6ad82edb709e24492 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-03-05Update git submodulesJulien1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "Add SDF files in Octopus" - Add SDF files in Octopus Add SDF files in Octopus to scenarios sub-directories. In the future, we will add schema files for SDF just like PDF/IDF. Change-Id: I248834bc7fe91bfbd8afe4827905f6ebd4f7a5ab Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
2018-03-03Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - [IDF] zte-pod1: Remove br-mgmt All recent Fuel deploy attempts on zte-pod1 failed due to br-mgmt not being present (or up), although it is defined in IDF. Since this bridge is optional in the Fuel deployment process and mostly useful for manual debugging, let's remove it from idf.fuel. Change-Id: I130ec61427237f979f6a6212ca8c291ba203ef39 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-03-03Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - [fuel] Fix missing space between yaml key:val Change-Id: Icf0e5d386f593bb691f777704ac799c8729221ce Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-03-03Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - generate_config: New `-b` arg for batch processing Sometimes, parsing multiple j2 templates based on the same PDF+IDF is needed, in which case we'd have to call generate_config once for each template. Add a new argument, `-b`, which allows batch processing of multiple templates in one go: - files ending in '.j2' (e.g. 'template.yml.j2') will be expanded to a file without the '.j2' suffix in the same directory as the source template (e.g. 'template.yml'); - templates not ending in '.j2' are skipped in batch mode; - in order to pass multiple templates, `-j` argument can now be passed multiple times, similar to `-i`; - although relative filepaths still work, it is highly recommended to use the full path (abspath) for j2 templates; - to avoid filename collisions, j2 parser will open '/' (as well as any directories specified via `-i`) and lookup each j2 template by its full path; Add a new argument, `-v` for verbose logging. While at it, import only needed functions from 'os.path' to make our code more compact and easier to read. Change-Id: I2291935d42e4196813cd75154d5b674bcc330183 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-03-02Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "config/utils: YAML: Use C bindings if available" - config/utils: YAML: Use C bindings if available Time diff before/after this change for the same template via generate_config expansion: -user 0m0.144s +user 0m0.096s Change-Id: Id574afcd8a74a530d791ebed8b72ccae53703611 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-03-02Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - generate_config: New `-i` arg for j2 includes dir jinja2 does not support imports from parent directories, so in order for j2 to be able to use '{% from <some>.j2 import ... %}' constructs with included j2 residing on a separate dirpath than current j2, add support for explicitly adding directories to the templater search path. This also allows calling generate_config with only file basename as '-j' arg value, as long as the dirname is passed via '-i' (can be extended later to parsing multiple j2 files at once). Change-Id: I943fda9262a6f7de5ee6fcc3e7bc9828c339651a Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - generate_config: Enable 'do' j2 extension 'do' is useful to avoid hacks like {% set _ = x.update(...) %}. Instead: {% do x.update(...) %}. [1] http://jinja.pocoo.org/docs/2.10/extensions/ Change-Id: I886beb97e0383ba11b81aa21cf12b11ebc4b05b2 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-02-27Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "[fuel] Improved IP handling on config template" - [fuel] Improved IP handling on config template -New IP addressing. Starts on lower available addresses for better compatibilty for small networks. IPs assigned secuentially and independently on each network. -Switched to advanced IP generation filters. Defined integers are no longer end of the IP address part but host order on the IP network. -Dynamic generation of compute nodes JIRA:FUEL-335 Change-Id: Ie95b83af64cb21ba27749d5f5d1506bfbc9ddf15 Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
2018-02-27Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - [IDF] arm-pod6: Use 2M hugepages, 12 cores for nova Change-Id: I03098ca3d4a90f6420cee64985c2853931a6a870 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-02-26Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - [IDF] arm-pod6: Fix nova_cpu_pinning param expr Constructs based on reclass interpolation (e.g. '${_param:x}') do not work when parameters are passed via reclass.storage templating, so change reclass interpolation syntax with classic YAML anchors. Change-Id: Ia974d45fc6a5869f4b30b31b947df088ea3aaf0c Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-02-24Update git submodulesCristina Pauna1-0/+0
* Update docs/submodules/pharos from branch 'master' - [fuel] IDF: Add DPDK parameters support In order to enable DPDK for OVS scenarios in Armband, we need DPDK specific configuration to be parameterizable. The default DPDK configuration values will remain in Fuel repo and will be overriden with the values defined in IDF (only if present). Since hugepage config and CPU pinning also apply to non-DPDK scenarios, handle them together for 'common', respectively 'dpdk'. To keep things simple, we will reuse the format expected by Fuel's reclass model, so we can pass the whole config block as-is. - IDF schema: fuel: Add strict checking of new block's structure, while allowing the rvalues to be more or less freestyle; - arm-pod6 IDF: Add initial config block implementation; JIRA: ARMBAND-342 Change-Id: I9224f06bb6b9fb2387414eb2a1be35461c27fb99 Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
2018-02-22Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - gen_config_lib: Add storage_size_num filter New filter for converting PDF disk_capacity strings into a numeric only string (to bypass scientific notation), parsable as float. Change-Id: I779bec7db03ef1b3ce1bfd6ca239a3e7b4021eb2 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-02-20Update git submodulesGuillermo Herrero1-0/+0
* Update docs/submodules/pharos from branch 'master' - generate_config: Move filters to external library Clean and isolate main script logic from custom filters by moving all them to a external library file. Library has a function to load all the existing filters at once. New enhanced IP handling custom filters: - ipnet_hostaddr - ipnet_hostmin - ipnet_hostmax - ipnet_broadcast - ipnet_netmask - ipnet_contains_ip - ipnet_contains_iprange - ipnet_range_size ipnet filters work with proper IP network with prefixlen mask, ensuring consistent IP calculations and error handling. Previous IP handling filters should be deprecated. Change-Id: I83c41d7ad3c6bd1d9df1deca6cc5b9d2481ecf52 Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
2018-02-16Update git submodulesDelia Popescu1-0/+0
* Update docs/submodules/pharos from branch 'master' - Configure stacklight IP addresses Related to: https://gerrit.opnfv.org/gerrit/#/c/52043/ Change-Id: I8378070f9efedc24229efc3c3d5542b62808e1e6 Signed-off-by: Delia Popescu <delia.popescu@enea.com>
2018-02-15Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "[PDF/IDF] LF-POD4" - [PDF/IDF] LF-POD4 Add PDF and IDF for LF-POD4 Change-Id: Ie3e682e40f751b8f91340373fbcabd522d3686a8 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-02-15Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/pharos from branch 'master' - [IDF] LF-POD5 Update networks for LF-POD5 since discovering there is a bug using non-/24 networks with Fuel, and to ensure there is no overlap with LF-POD4. Change-Id: Ie6eb6f12e8fd2831355e8bcec064e152cdc02f27 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-02-13Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "Update PTL to Julien Zhang in INFO file" - Update PTL to Julien Zhang in INFO file Includes a link to the TSC notice of PTL change. Change-Id: Ib5ea9abdc9bcfec29c3cb1ab02906221436969f1 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-02-12Update git submodulesJulien1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "Copy scenario-lifecycle docs into pharos" - Copy scenario-lifecycle docs into pharos Copy project scenario-lifecycle from Octopus and keep the original format. Change-Id: I312b81b88fa7e69cf4b8c23b50f941aab8fba9bd Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
2018-02-05Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - [IDF] Schema: Add OSA installer stubs While at it, order installers by name in IDF schema. Change-Id: I4bf1dd047a3f7a64b8bc928951fc18c4728a9b68 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-02-01Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - [fuel] pod_config: Consume newly added MaaS props Change-Id: I23446e82dd148afd14d56717dd35fe0ee271d971 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-02-01Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - [fuel] Allow MaaS timeout config via IDF MaaS timeouts should be configurable on per-POD basis, since nodes in some labs take longer to comission/deploy than our default values. IDF SCHEMA: - add new properties to Fuel IDF section; Change-Id: Ife5ff85faeae683a8c1781cae8b29f09c1f07b82 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-02-01Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - [IDF] lf-pod2: Add missing bridge, eth info Some information was lost while syncing from securedlab to pharos git repo, bring it back. Change-Id: I938f4c573234c7a9d55eb140ea02f3328373ae1d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-30Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge changes from topics 'fuel-netmap', 'fix-check-jinja' * changes: [fuel] Add net_map.j2 for net config abstraction [fuel] Explicitly blacklist incompatible labs [IDF] Add optional 'idf.installer' array - [fuel] Add net_map.j2 for net config abstraction This will be leveraged by other j2 templates in Fuel to construct scenario-specific network config files. Change-Id: Iba1fd99b23936fe42abe16af3cd80dce2a63d997 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - [fuel] Explicitly blacklist incompatible labs Previously, we used to silently refuse to construct 'pod_config' for PODs missing mandatory PDF/IDF configuration; and instead generated an empty output YAML. Retire safety checks in Fuel IA and explicitly blacklist Fuel via new 'idf.installer' where appropiate. The following PODs do not yet support Fuel due to missing 'idf.fuel': - ericsson-pod2 - huawei-pod1 - intel-pod18 - nokia-pod1 - zte-pod2 - zte-pod3 Change-Id: Ief62d62f99a79187303e3f15b83030289e5efdcb Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - [IDF] Add optional 'idf.installer' array There is no easy way to determine automatically if a PDF/IDF set is compatible with a specific installer adapter. Most common incompatibilities are caused by: - installer adapters hardcode more network ports than nodes have defined in PDF; - installer adapters hardcode more nodes than PDF defines; Previous attempt at handling this dynamically (cd54edf) fails for recently added PODs, so let's handle this explicitly per-pod via a new optional IDF property, 'idf.installer'. If 'idf.installer' is defined, it will be used by `check-jinja2.sh` as a filter-in list of installer adapters to check against. The default (no 'idf.installer' present) is to check all IAs. Leverage the new property for: - arm-pod5: not enough network ports on computes for Compass, Joid; - arm-pod7: same as arm-pod5; - bii-pod1: no 'storage' network defined in IDF for Daisy; - zte-pod9: 3 cluster nodes are only supported by Daisy for now; SPEC changes: - net_config (previously mandatory for IDF version '0.1') is now mandatory only if 'idf.fuel' or 'idf.daisy' is defined; Fixes: cd54edf Change-Id: I706c05519e5491ad631069d7cc090e9c8bfd3011 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-29Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "[fuel] Update IA for vPDF support" - [fuel] Update IA for vPDF support - move gtw tenant addrs from {6,7,9} to {124,125,126} (e.g. 10.0.1.6 -> 10.0.1.124 for ericsson-virtual* PODs); - add gtw external (public) addresses, e.g. 10.16.0.124; - add ctl external (public) addresses, e.g. 10.16.0.11; JIRA: FUEL-322 Change-Id: Ice73aa3985831dca7427e496850d0865db71477e Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>