Alexandru Avadanii [Tue, 27 Feb 2018 02:52:19 +0000 (03:52 +0100)]
[IDF] arm-pod6: Use 2M hugepages, 12 cores for nova
Change-Id: I03098ca3d4a90f6420cee64985c2853931a6a870
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Mon, 26 Feb 2018 18:07:09 +0000 (19:07 +0100)]
[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>
Cristina Pauna [Tue, 20 Feb 2018 16:29:42 +0000 (18:29 +0200)]
[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>
Alexandru Avadanii [Thu, 22 Feb 2018 00:31:50 +0000 (01:31 +0100)]
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>
Guillermo Herrero [Wed, 31 Jan 2018 15:39:02 +0000 (16:39 +0100)]
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>
Delia Popescu [Fri, 16 Feb 2018 11:56:24 +0000 (13:56 +0200)]
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>
Trevor Bramwell [Thu, 15 Feb 2018 00:54:39 +0000 (00:54 +0000)]
Merge "[PDF/IDF] LF-POD4"
Trevor Bramwell [Wed, 14 Feb 2018 20:28:52 +0000 (12:28 -0800)]
[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>
Trevor Bramwell [Wed, 14 Feb 2018 20:27:26 +0000 (12:27 -0800)]
[PDF/IDF] LF-POD4
Add PDF and IDF for LF-POD4
Change-Id: Ie3e682e40f751b8f91340373fbcabd522d3686a8
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Alexandru Avadanii [Tue, 13 Feb 2018 15:07:37 +0000 (15:07 +0000)]
Merge "Update PTL to Julien Zhang in INFO file"
Julien [Mon, 12 Feb 2018 10:46:39 +0000 (10:46 +0000)]
Merge "Copy scenario-lifecycle docs into pharos"
Trevor Bramwell [Thu, 8 Feb 2018 18:10:44 +0000 (10:10 -0800)]
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>
Alexandru Avadanii [Mon, 5 Feb 2018 18:38:16 +0000 (19:38 +0100)]
[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>
Julien [Mon, 5 Feb 2018 12:12:43 +0000 (20:12 +0800)]
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>
Alexandru Avadanii [Thu, 1 Feb 2018 17:45:39 +0000 (18:45 +0100)]
[fuel] pod_config: Consume newly added MaaS props
Change-Id: I23446e82dd148afd14d56717dd35fe0ee271d971
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Thu, 1 Feb 2018 16:27:19 +0000 (17:27 +0100)]
[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>
Alexandru Avadanii [Thu, 1 Feb 2018 15:39:29 +0000 (16:39 +0100)]
[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>
Alexandru Avadanii [Tue, 30 Jan 2018 22:32:46 +0000 (22:32 +0000)]
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
Alexandru Avadanii [Mon, 29 Jan 2018 16:17:01 +0000 (16:17 +0000)]
Merge "[fuel] Update IA for vPDF support"
Alexandru Avadanii [Sun, 28 Jan 2018 16:36:50 +0000 (17:36 +0100)]
[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>
Alexandru Avadanii [Sun, 28 Jan 2018 18:34:31 +0000 (19:34 +0100)]
[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>
Alexandru Avadanii [Wed, 24 Jan 2018 20:02:40 +0000 (21:02 +0100)]
[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>
Alexandru Avadanii [Sat, 27 Jan 2018 18:55:31 +0000 (19:55 +0100)]
[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>
Alexandru Avadanii [Wed, 24 Jan 2018 21:47:52 +0000 (22:47 +0100)]
[daisy] network template: Fix set inside loop
Previous implementation fails in older versions of py-jinja2.
See related bug reports [1, 2].
Since `networks.update` on its own is enough, stop assigning its
result back to 'networks'.
[1] https://github.com/pallets/jinja/issues/641
[2] https://github.com/pallets/jinja/issues/164
Change-Id: I303388223bdec9ae43e49d988aee41b5b47c1562
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Sun, 28 Jan 2018 17:53:25 +0000 (17:53 +0000)]
Merge "[PDF] Update LF-POD5 IDF bridges, interfaces"
Alexandru Avadanii [Sun, 28 Jan 2018 17:53:11 +0000 (17:53 +0000)]
Merge "[joid] Refresh installer adapter for Pike"
Trevor Bramwell [Mon, 8 Jan 2018 22:11:53 +0000 (14:11 -0800)]
[PDF] Update LF-POD5 IDF bridges, interfaces
Change-Id: Ia761d6cecc360dde729965e499a899ba4fbc6a32
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Alexandru Avadanii [Sun, 28 Jan 2018 17:46:17 +0000 (17:46 +0000)]
Merge "[IDF] zte-pod1: Fix admin bridge"
Alexandru Avadanii [Sun, 28 Jan 2018 17:44:50 +0000 (17:44 +0000)]
Merge "[daisy] Use jump remote_management params"
Alexandru Avadanii [Sun, 28 Jan 2018 17:44:26 +0000 (17:44 +0000)]
Merge "[compass4nfv] Use jump remote_management params"
Alexandru Avadanii [Sun, 28 Jan 2018 17:43:32 +0000 (17:43 +0000)]
Merge "[joid] Use node remote_management params"
Alexandru Avadanii [Fri, 26 Jan 2018 20:32:07 +0000 (21:32 +0100)]
generate_config: Check yaml arg is really a file
In order to support bash process substition, e.g.
$ ./generate_config.py -j /path/to/template.j2 -y <(echo stuff);
do not consume the contents of ARGS.yaml unless it is a file.
Change-Id: I89053cfaadc158f6a15f85836892b21980081772
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Fri, 26 Jan 2018 01:24:41 +0000 (02:24 +0100)]
[IDF] zte-pod1: Fix admin bridge
Align PXE/admin bridge name on jumpserver with value in releng
slave param BRIDGE for zte-pod1.
Change-Id: I57e1079bc047046cb85afe6d7f7abcc340217235
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Wed, 24 Jan 2018 22:44:36 +0000 (23:44 +0100)]
[compass4nfv] Use jump remote_management params
Stop relying on 'remote_params' optional YAML anchor.
Change-Id: I8d967b767cf66b298a651306c9bcc91cc9acb0a6
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Thu, 25 Jan 2018 18:45:02 +0000 (19:45 +0100)]
[joid] Refresh installer adapter for Pike
Change-Id: I4e4960a772fcd5ae32e34c9bf375ed78e3a30311
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Wed, 24 Jan 2018 22:39:38 +0000 (23:39 +0100)]
[joid] Use node remote_management params
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: Ia8925261bc8242cbfd195f1d09bb61121b3fdacf
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Wed, 24 Jan 2018 22:50:33 +0000 (23:50 +0100)]
[daisy] Use jump remote_management params
Stop relying on 'remote_params' optional YAML anchor.
Change-Id: Ie5c563834cee19d676cc635c622ebbe8ffc0cc83
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Aric Gardner [Wed, 24 Jan 2018 16:36:42 +0000 (16:36 +0000)]
Merge "[IDF] Add IDF schema validation based on version"
Alexandru Avadanii [Wed, 24 Jan 2018 16:26:05 +0000 (16:26 +0000)]
Merge "[fuel] Get public pool parameters from idf.fuel"
Aric Gardner [Wed, 24 Jan 2018 16:11:35 +0000 (16:11 +0000)]
Merge "update user/passwd"
Alexandru Avadanii [Wed, 24 Jan 2018 15:24:08 +0000 (15:24 +0000)]
Merge "nokia-pod1: Add PDF version"
Guillermo Herrero [Mon, 22 Jan 2018 13:19:20 +0000 (14:19 +0100)]
[fuel] Get public pool parameters from idf.fuel
Reads parameters from idf.fuel.config.public_pool
start_ip and end_ip
JIRA: FUEL-315
Change-Id: I4456b22bc21b20906f18953d80a57483fd6700bc
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
mting [Wed, 24 Jan 2018 10:27:04 +0000 (11:27 +0100)]
update user/passwd
Change-Id: I9675e419bdda676cb2d4fa6ae49d0c4198006d33
Alexandru Avadanii [Sun, 14 Jan 2018 01:26:05 +0000 (02:26 +0100)]
[IDF] Add IDF schema validation based on version
- add basic structure for IDF schema validation;
- fill in Fuel section;
- add stub for Daisy section;
- add stub for Compass section;
- add stub for net_config;
- enable IDF schema validation via `check-schema.sh`;
- prepare for new IDF versions with different schemas,
while allowing subsection schema reuse from IDF v0.1;
- extend validate_schema.py for IDF;
Change-Id: I59b1c9d857e9dee9e6ff9956e81b2ae6dc27a767
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Tue, 23 Jan 2018 21:10:21 +0000 (22:10 +0100)]
nokia-pod1: Add PDF version
Fix PDF schema validation by adding mandatory version param.
Change-Id: Ic86d182ce8e4a290e9bd3a0ae3dc1823ab27c8e8
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Tue, 23 Jan 2018 21:05:02 +0000 (22:05 +0100)]
intel-pod18: Fix typo in MAC address
While at it, add dummy user/pass IPMI credentials, so we can pass
schema validation.
Change-Id: I3538f5aee21731e46fe0d831d164961c33118e2e
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
julien zhang [Tue, 23 Jan 2018 16:03:37 +0000 (16:03 +0000)]
Merge "[PDF] [SPEC] Add 'version: 1.0'"
Alexandru Avadanii [Mon, 22 Jan 2018 17:41:02 +0000 (18:41 +0100)]
[fuel] Fix missing EOL after yaml doc start
Fixes:
4cef6b2
Change-Id: I628ce8da7e0959ff916082c1fc30934dca0d93dc
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Mon, 15 Jan 2018 03:32:31 +0000 (04:32 +0100)]
[PDF] [SPEC] Add 'version: 1.0'
- add 'version: 1.0' to PDF spec;
- add 'version: 1.0' to all existing lab PDFs;
- extend schema with new property;
- add workaround for value-based decision-making in schema version
selection via `validate-template.py`;
- add support for multiple schema versions;
- add versions for all schema blocks defined so far;
- fix PDF schema pattern for disk size decimals (e.g. '1.8T');
Change-Id: Ie8f768803ec19f1f9a7982fe5ca59df80764fc4a
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Mon, 22 Jan 2018 16:50:10 +0000 (16:50 +0000)]
Merge "[PDF] check-jinja: Filter-out incompatible PDF/IA"
Alexandru Avadanii [Mon, 22 Jan 2018 16:49:57 +0000 (16:49 +0000)]
Merge "[fuel] Add support to use public net netmask from IDF"
Alexandru Avadanii [Mon, 22 Jan 2018 16:49:34 +0000 (16:49 +0000)]
Merge "generate_config: Add netmask jinja filter"
Alexandru Avadanii [Mon, 22 Jan 2018 16:49:07 +0000 (16:49 +0000)]
Merge "update BII pod1 PDF for Euphrates install"
Aric Gardner [Mon, 22 Jan 2018 16:47:14 +0000 (16:47 +0000)]
Merge "[apex] Use node remote_management params"
Alexandru Avadanii [Mon, 22 Jan 2018 16:32:40 +0000 (16:32 +0000)]
Merge "check-jinja: Add optional filtering of test matrix"
Alexandru Avadanii [Mon, 22 Jan 2018 16:28:38 +0000 (16:28 +0000)]
Merge "Nokia public lab Pod Descriptor File"
Aric Gardner [Mon, 22 Jan 2018 16:13:11 +0000 (16:13 +0000)]
Merge "[PDF] config: Add/update license headers"
Alexandru Avadanii [Mon, 22 Jan 2018 16:10:29 +0000 (16:10 +0000)]
Merge "arm-pod7: add new PDF and IDF files"
louie.long [Thu, 18 Jan 2018 03:46:21 +0000 (11:46 +0800)]
update BII pod1 PDF for Euphrates install
- 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>
Alexandru Avadanii [Sat, 20 Jan 2018 20:52:56 +0000 (21:52 +0100)]
[fuel] Add proxy node management network VIP
Change-Id: I5fd74163cab8f6ee5f575ed72edfcc6919e60161
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Sat, 20 Jan 2018 20:50:48 +0000 (21:50 +0100)]
[fuel] Update MaaS PXE config
- 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>
Alexandru Avadanii [Fri, 19 Jan 2018 18:54:42 +0000 (19:54 +0100)]
check-jinja: Add optional filtering of test matrix
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>
ting wu [Thu, 18 Jan 2018 12:27:28 +0000 (13:27 +0100)]
arm-pod7: add new PDF and IDF files
- 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>
Guillermo Herrero [Tue, 16 Jan 2018 11:59:23 +0000 (12:59 +0100)]
[fuel] Add support to use public net netmask from IDF
- 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>
Alexandru Avadanii [Fri, 19 Jan 2018 01:58:04 +0000 (02:58 +0100)]
[apex] Use node remote_management params
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>
Guillermo Herrero [Tue, 16 Jan 2018 11:03:19 +0000 (12:03 +0100)]
generate_config: Add netmask jinja filter
- 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>
Mika Rautakumpu [Tue, 16 Jan 2018 08:47:20 +0000 (10:47 +0200)]
Nokia public lab Pod Descriptor File
Comment lines removed, typos fixed and missing fields added.
Change-Id: Ic027544b2e7e70fb7c02452945fb2a1252417ce3
Signed-off-by: Mika Rautakumpu <mika.rautakumpu@nokia.com>
Jack Morgan [Tue, 16 Jan 2018 23:43:36 +0000 (23:43 +0000)]
Merge "Committers standing down"
Alex Yang [Tue, 16 Jan 2018 10:03:59 +0000 (18:03 +0800)]
Fix daisy gateway generated by PDF
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>
Alexandru Avadanii [Mon, 15 Jan 2018 00:33:02 +0000 (01:33 +0100)]
[PDF] check-jinja: Filter-out incompatible PDF/IA
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>
Aric Gardner [Mon, 15 Jan 2018 22:03:37 +0000 (22:03 +0000)]
Merge changes from topics 'pdf-spec-update', 'pdf-schema'
* 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
Aric Gardner [Mon, 15 Jan 2018 21:50:30 +0000 (21:50 +0000)]
Merge changes from topic 'fix-pdf-spec-deviations'
* 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
Aric Gardner [Mon, 15 Jan 2018 21:45:00 +0000 (21:45 +0000)]
Merge changes from topic 'move-net_config-idf'
* 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
Aric Gardner [Mon, 15 Jan 2018 21:38:39 +0000 (21:38 +0000)]
Merge "[PDF] check-jinja: cleanup, compact output"
Aric Gardner [Mon, 15 Jan 2018 21:37:12 +0000 (21:37 +0000)]
Merge changes from topic 'yamllint-fix'
* 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
wutianwei [Wed, 27 Dec 2017 12:23:35 +0000 (20:23 +0800)]
Add the huawei-pod1 PDF and IDF
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>
Alexandru Avadanii [Sat, 13 Jan 2018 21:47:56 +0000 (22:47 +0100)]
[PDF] [SPEC] disk_interface: Add 'scsi', 'iscsi'
zte-pod3 and ericsson-pod1 define their disk interfaces as (i)SCSI.
Change-Id: I97945f7a41eec4e8a38de544af95ce4af82df200
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Sat, 13 Jan 2018 19:29:16 +0000 (20:29 +0100)]
[PDF] [SPEC] Align interface keys for NIC names
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>
Alexandru Avadanii [Sat, 13 Jan 2018 18:43:48 +0000 (19:43 +0100)]
[PDF] [SPEC] Extend disk_rotation enum with '0'
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>
Alexandru Avadanii [Sat, 13 Jan 2018 17:35:04 +0000 (18:35 +0100)]
[PDF] Add schema validation
- 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>
Alexandru Avadanii [Sat, 13 Jan 2018 21:18:29 +0000 (22:18 +0100)]
[PDF] zte-pod*: Fix spec deviations
- 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>
Alexandru Avadanii [Sat, 13 Jan 2018 22:03:43 +0000 (23:03 +0100)]
[PDF] lf-pod*: Fix spec deviations
- 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>
Alexandru Avadanii [Sat, 13 Jan 2018 19:35:27 +0000 (20:35 +0100)]
[PDF] intel-pod*: Fix spec deviations
- 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>
Alexandru Avadanii [Sat, 13 Jan 2018 22:13:30 +0000 (23:13 +0100)]
[PDF] ericsson-pod*: Fix spec deviations
- 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>
Alexandru Avadanii [Sat, 13 Jan 2018 23:20:19 +0000 (00:20 +0100)]
[PDF] bii-pod*: Fix spec deviations
- add 'name: nicN' to jumpserver & node interfaces;
- fix 'pod_owner' key name;
Change-Id: I6136fc066e615c226a2f57d566a2938b8f883f49
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Sat, 13 Jan 2018 18:53:06 +0000 (19:53 +0100)]
[PDF] arm-pod*: Fix spec deviations
- 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>
Alexandru Avadanii [Sun, 14 Jan 2018 19:04:09 +0000 (20:04 +0100)]
[PDF] Daisy, Fuel: Drop support for PDF net_config
Change-Id: I889db9a4663f1b2740207e6c25dc8d09645a3708
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Sat, 13 Jan 2018 20:58:42 +0000 (21:58 +0100)]
[PDF] zte-pod*: Move net_config to IDF
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>
Alexandru Avadanii [Sat, 13 Jan 2018 21:53:37 +0000 (22:53 +0100)]
[PDF] lf-pod*: Drop 'fixed_ips'
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>
Alexandru Avadanii [Sat, 13 Jan 2018 19:54:24 +0000 (20:54 +0100)]
[PDD] ericsson-pod*: Move net_config to IDF
Change-Id: Ide79f18bae20e599eeefe13f4ad2dba1f4a0207d
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Sat, 13 Jan 2018 23:03:11 +0000 (00:03 +0100)]
[PDF] bii-pod*: Move net_config to IDF
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>
Alexandru Avadanii [Sat, 13 Jan 2018 18:51:29 +0000 (19:51 +0100)]
[PDF] arm-pod*: Move net_config to IDF
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>
Alexandru Avadanii [Sun, 14 Jan 2018 18:50:48 +0000 (19:50 +0100)]
[PDF] Daisy, Fuel: Add support for IDF net_config
- 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>
Alexandru Avadanii [Fri, 12 Jan 2018 20:49:01 +0000 (21:49 +0100)]
[PDF] config: Add/update license headers
This only covers the `config` subdir.
Change-Id: I1fb9470e216cc2de9a4ac91de44d99e7044e708e
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Sat, 13 Jan 2018 01:30:38 +0000 (02:30 +0100)]
[PDF] check-jinja: cleanup, compact output
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>
Alexandru Avadanii [Fri, 12 Jan 2018 22:18:00 +0000 (23:18 +0100)]
[PDF] check-jinja: Replace encrypted str w/ dummy
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>
Alexandru Avadanii [Fri, 12 Jan 2018 18:45:21 +0000 (19:45 +0100)]
[PDF] Fix yamllint issues in installer adapters
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>
Alexandru Avadanii [Fri, 12 Jan 2018 21:27:26 +0000 (22:27 +0100)]
[PDF] check-jinja: Disable check against template
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>
Alexandru Avadanii [Fri, 12 Jan 2018 20:28:22 +0000 (21:28 +0100)]
[PDF] generate_config: eyaml only encrypted PDFs
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>
julien zhang [Sun, 14 Jan 2018 01:45:12 +0000 (01:45 +0000)]
Merge "support gen DHA/NETWORK yaml by pdf"