Martin Klozik [Thu, 20 Dec 2018 16:33:36 +0000 (17:33 +0100)]
[IDF] intel-pod18 private vlan range
Change private network vlan definition from "native" to specific
vlan range. In case of "native", fuel installation fails to
correctly define IP for br-mesh interface. As a result neutron
ovs agent doesn't work, ports can't be created and VMs
can't start up.
Change-Id: I5792ced38339ff1a56b8ea4e9f3f37ecfb861bf5
Signed-off-by: Martin Klozik <martin.klozik@tieto.com>
Alexandru Avadanii [Tue, 11 Dec 2018 15:00:45 +0000 (16:00 +0100)]
[fuel] IDF: Add idf.fuel.network.interface_mtu
Allow configuring cluster-level jumbo frames via IDF.
All virtual PODs default to using jumbo frames, while baremetal
PODs will keep using 1500 until we confirm all switches are
properly configured.
While at it, update net_macros to configure MTU for VLAN interfaces
too.
JIRA: FUEL-336
Change-Id: Id6c7ec9377b15d53e69c8cbb16fa469b52ab7e3a
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Guillermo Herrero [Thu, 29 Nov 2018 13:26:35 +0000 (14:26 +0100)]
Fix pod10 dpdk params
Change-Id: Ic72d1468eb8fee74e25c540073c408081c8ee8b8
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
Guillermo Herrero [Wed, 28 Nov 2018 13:02:36 +0000 (14:02 +0100)]
arm pod-10: reorder unused interfaces
Change-Id: I491edc564a2b0777c0afc65eb0ebc1b2d97f44fc
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
Your Name [Mon, 15 Oct 2018 15:23:33 +0000 (08:23 -0700)]
intel-pod18: add fuel support
Adding support for fuel installation on intel-pod18
Change-Id: Ieaad34fd2c0aa96f9aa1f48f403c46cd890437eb
Signed-off-by: Paul Vaduva <Paul.Vaduva@enea.com>
Alexandru Avadanii [Tue, 6 Nov 2018 20:25:56 +0000 (20:25 +0000)]
Merge "[fuel] IA: Rename power_password to power_pass"
Cristina Pauna [Mon, 5 Nov 2018 15:48:54 +0000 (16:48 +0100)]
Update idf parameters for arm-pod5
Change-Id: I1d2d3c461154f7b57d1c0e1a58be9d9a5873f61d
Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
Guillermo Herrero [Thu, 25 Oct 2018 14:33:44 +0000 (16:33 +0200)]
[IDF] arm-pod10: added as new idf and pdf
Change-Id: I74b1c7db1e7c7b53518660e92e810ff60f827d64
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
Alexandru Avadanii [Mon, 29 Oct 2018 15:10:48 +0000 (16:10 +0100)]
[fuel] IA: Rename power_password to power_pass
Align with MaaS expected variable naming after upstream change [1].
[1] https://github.com/salt-formulas/salt-formula-maas/commit/
6096333
Change-Id: I0d4af1af1c54b40bf9a84ccf5f16847b9d39d456
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Guillermo Herrero [Thu, 18 Oct 2018 07:00:20 +0000 (07:00 +0000)]
Merge "[arm pod5] Added new NIC info"
Guillermo Herrero [Mon, 15 Oct 2018 16:14:49 +0000 (18:14 +0200)]
[arm pod5] Added new NIC info
Change-Id: I7a363100fb0affe5ac4e27885727cf517621f4e6
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
Stamatis Katsaounis [Mon, 8 Oct 2018 11:13:25 +0000 (14:13 +0300)]
Provide opendaylight server with a public ip
JIRA: FUEL-393
This patch reserves a public ip for opendaylight. This ip is needed
for running the test-case 3 of sdnvpn test-cases, which run as part
of the bgpvpn scenario.
Change-Id: I57288bbb42f4c75af19f3807f8f15b44482c066c
Signed-off-by: Stamatis Katsaounis <mokats@intracom-telecom.com>
Alexandru Avadanii [Fri, 28 Sep 2018 12:15:39 +0000 (14:15 +0200)]
[fuel] IA: Reserve IP addresses for 3 ODL nodes
Change-Id: Ifcfd806d568c3cda375166b9c63381f66ee375c4
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Aric Gardner [Tue, 18 Sep 2018 15:04:52 +0000 (11:04 -0400)]
Local Documentation Builds
This adds configuration for performing local documentation builds
with the following simple command:
tox -e docs
Change-Id: Ib0d60d9f458b19dd5e77de962d34c1d299de7b16
Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>
Aric Gardner [Tue, 18 Sep 2018 14:34:29 +0000 (14:34 +0000)]
Merge "Auto Generated INFO.yaml file"
Alexandru Avadanii [Fri, 31 Aug 2018 00:13:10 +0000 (02:13 +0200)]
[fuel] IA: sync maas:machines changes
Change-Id: Ib4859e4ada3d72e7e848114620ff5405c26b3126
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Julien [Tue, 21 Aug 2018 06:55:44 +0000 (14:55 +0800)]
Fix trailing spaces issue when generates yml files
There are some missing coniguration in jinja2 template, which will cause
the trailing spaces issues. Currently just add some comments in the end.
Change-Id: I4fe250cda1192d7c6e7cead0251ac5e7978cd310
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
Julien [Tue, 21 Aug 2018 06:24:57 +0000 (14:24 +0800)]
Fail to set the value in multiple lines
refer to the log of Jenkins:
https://build.opnfv.org/ci/view/pharos/job/
validate-pdf-jinja2-templates-master/326/console
/home/jenkins-ci/opnfv/slave_root/workspace/
validate-pdf-jinja2-templates-master/config/utils/check-jinja2.sh:
line 54: -i ./config/installers/apex: No such file or directory
[GENERATE] [OK]
[YAMLLINT] [OK] yamllint -s ./config/installers/apex/pod_config.yaml
Change-Id: I13c220e7fba5355124ae2b41e7399140c5d92523
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
Alexandru Avadanii [Fri, 17 Aug 2018 15:31:32 +0000 (15:31 +0000)]
Merge "Add mask to the oob networks"
Manuel Buil [Fri, 10 Aug 2018 12:15:29 +0000 (14:15 +0200)]
Update the pdf/idf for ericsson pod2
Change-Id: I9b5db404cde0414f34621cf12819fd3edfcf0414
Signed-off-by: Manuel Buil <mbuil@suse.com>
Manuel Buil [Tue, 14 Aug 2018 06:14:36 +0000 (08:14 +0200)]
Add mask to the oob networks
It is not needed but it helps a lot to the xci parser
Change-Id: I6943b21cd2aca2036783430cde03fb8d3b567f3b
Signed-off-by: Manuel Buil <mbuil@suse.com>
Manuel Buil [Mon, 13 Aug 2018 17:29:31 +0000 (19:29 +0200)]
Complete osa and add kubespray to the idf schema
Modify idf of lf pod4 to aoid -1 from Jenkins
Change-Id: I4fbac6ed2859e79aeef61b070498833b182f2b5d
Signed-off-by: Manuel Buil <mbuil@suse.com>
Alexandru Avadanii [Mon, 6 Aug 2018 21:54:04 +0000 (23:54 +0200)]
[idf.fuel] Add jumpserver.trunks for mgmt
Extend IDF schema for Fuel installer section to allow a new param,
useful when jumpserver networks should be trunked for infra VMs.
JIRA: FUEL-338
Change-Id: Ifda18ea017c069e29d25d48aea62a6b6b37e91b5
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Guillermo Herrero [Fri, 27 Jul 2018 09:45:05 +0000 (11:45 +0200)]
[arm-pod9] Increase fuel maas timeouts
Change-Id: I0bf27ddc06b5c6efa64b41a32573bf09990c95b5
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
Alexandru Avadanii [Thu, 28 Jun 2018 14:46:36 +0000 (16:46 +0200)]
[arm-virtual2] Add ip-range to avoid IP conflicts
Change-Id: Ib7858d57d3e0cc1a428905a63c4d342be260a673
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Wed, 20 Jun 2018 16:32:45 +0000 (18:32 +0200)]
[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>
Paul Vaduva [Mon, 18 Jun 2018 14:34:41 +0000 (16:34 +0200)]
unh-pod1: restrict public ip range to avoid conflict
Change-Id: I7644fe6eedc71b4e67ea6b6d112a06685ea26602
Signed-off-by: Paul Vaduva <Paul.Vaduva@enea.com>
Alexandru Avadanii [Tue, 12 Jun 2018 14:14:53 +0000 (14:14 +0000)]
Merge "Adding reclass sections to idf-pod1 file"
Paul Vaduva [Tue, 12 Jun 2018 12:30:03 +0000 (14:30 +0200)]
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>
Alexandru Avadanii [Fri, 8 Jun 2018 17:07:47 +0000 (19:07 +0200)]
[idf.fuel] Add NTP for new virtual PODs
Change-Id: I6172e909c51e796b16f62f2d8e0cb0497306ce2a
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Fri, 8 Jun 2018 16:54:04 +0000 (16:54 +0000)]
Merge "[PDF] Add arm-virtual2 PDF/IDF"
Alexandru Avadanii [Fri, 8 Jun 2018 16:53:50 +0000 (16:53 +0000)]
Merge "add ericsson vpod PDF"
Alexandru Avadanii [Mon, 4 Jun 2018 16:53:26 +0000 (16:53 +0000)]
Merge "[fuel] IA: Add PXE/admin static IPs"
mting [Mon, 4 Jun 2018 13:26:33 +0000 (15:26 +0200)]
update ilo mac address after hw replacement
Change-Id: I9df2e117d8a2036c9555ddfe41d636b9e30910e8
Alexandru Avadanii [Mon, 4 Jun 2018 12:38:38 +0000 (12:38 +0000)]
Merge "[idf.fuel] Add NTP servers"
Alexandru Avadanii [Sat, 7 Apr 2018 08:58:08 +0000 (10:58 +0200)]
[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>
Alexandru Avadanii [Thu, 31 May 2018 14:05:30 +0000 (16:05 +0200)]
[idf.fuel] Add NTP servers
Change-Id: Ib840995b085ec9d8a585d5cf2e2a84e5801875b6
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Guillermo Herrero [Wed, 30 May 2018 12:58:52 +0000 (12:58 +0000)]
Merge "IDF and PDF files for auto pod in unh lab"
Guillermo Herrero [Wed, 30 May 2018 10:57:48 +0000 (10:57 +0000)]
Merge "[IDF] arm-pod9: added as new idf and pdf"
Guillermo Herrero [Wed, 30 May 2018 10:57:37 +0000 (10:57 +0000)]
Merge "[IDF] arm-pod8: added as new idf and pdf"
Guillermo Herrero [Wed, 16 May 2018 09:00:51 +0000 (11:00 +0200)]
[IDF] arm-pod9: added as new idf and pdf
Change-Id: I415eda9f493fcd70514d5f9be7d58b7b6d1cb88f
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
Guillermo Herrero [Fri, 27 Apr 2018 12:28:37 +0000 (14:28 +0200)]
[IDF] arm-pod8: added as new idf and pdf
Change-Id: I01c678b45fd182bef8a95bdf13054a36347e057b
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
pava [Tue, 22 May 2018 14:58:51 +0000 (16:58 +0200)]
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>
mting [Tue, 17 Apr 2018 11:51:28 +0000 (13:51 +0200)]
add ericsson vpod PDF
Change-Id: I20e70ec3264e807fb85585441d51752b13f5389d
Signed-off-by: mting <dianfeng.du@ericsson.com>
Alexandru Avadanii [Sat, 27 Jan 2018 20:24:59 +0000 (21:24 +0100)]
[PDF] Add arm-virtual2 PDF/IDF
JIRA: FUEL-322
Change-Id: I3b136d6eebdaf0f09c772d2b994158af99cd8fea
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Thu, 28 Dec 2017 22:24:41 +0000 (23:24 +0100)]
[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>
Julien [Mon, 30 Apr 2018 15:23:12 +0000 (15:23 +0000)]
Merge "Okinawa Open Labratory(OOL) POD1 PDF/IDF"
zhihui wu [Tue, 24 Apr 2018 09:48:41 +0000 (17:48 +0800)]
update idf file for zte-pod1
Change-Id: Iffed25c5e01aa9bf2a7b4a7103b07fb1c097d811
Signed-off-by: zhihui wu <wu.zhihui1@zte.com.cn>
hhayashiool [Mon, 16 Apr 2018 06:32:08 +0000 (15:32 +0900)]
Okinawa Open Labratory(OOL) POD1 PDF/IDF
Change-Id: I0980de9c2ff37654dbfd2d58002b9e61226cf749
Signed-off-by: Hideyasu Hayashi <hideyasu.hayashi@okinawaopenlabs.org>
Alexandru Avadanii [Wed, 18 Apr 2018 16:37:29 +0000 (18:37 +0200)]
[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>
agardner [Wed, 28 Mar 2018 20:06:23 +0000 (16:06 -0400)]
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>
Guillermo Herrero [Wed, 11 Apr 2018 15:42:50 +0000 (17:42 +0200)]
[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>
Alex Yang [Thu, 29 Mar 2018 07:19:25 +0000 (15:19 +0800)]
[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>
Alexandru Avadanii [Fri, 23 Mar 2018 20:28:54 +0000 (20:28 +0000)]
Merge "[IDF] arm-pod7: Configure hugepages and cpupinning variables for armpod7"
Charalampos Kominos [Wed, 14 Mar 2018 12:56:17 +0000 (13:56 +0100)]
[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>
Charalampos Kominos [Wed, 14 Mar 2018 14:43:34 +0000 (15:43 +0100)]
[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>
Alexandru Avadanii [Fri, 9 Mar 2018 19:34:55 +0000 (20:34 +0100)]
[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>
Alexandru Avadanii [Wed, 7 Mar 2018 19:17:39 +0000 (20:17 +0100)]
[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>
Blaisonneau David [Mon, 5 Feb 2018 10:56:51 +0000 (11:56 +0100)]
LF-POD4 PDF/IDF
PDF+IDF for LF POD4 inspired from securelab PDF and LF-pod2 XDFs.
Change-Id: If7ee14efe5f279104a18d2a3281aa7b23bdf704a
Alexandru Avadanii [Mon, 5 Mar 2018 17:50:07 +0000 (17:50 +0000)]
Merge "config/installers: Adopt j2 'do' extension"
Alexandru Avadanii [Mon, 5 Mar 2018 16:58:01 +0000 (17:58 +0100)]
generate_config: minor code formatting updates
Change-Id: If0ee12287f4257f2de315bd6ad82edb709e24492
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Julien [Mon, 5 Mar 2018 03:27:39 +0000 (03:27 +0000)]
Merge "Add SDF files in Octopus"
Alexandru Avadanii [Sat, 3 Mar 2018 18:32:58 +0000 (19:32 +0100)]
[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>
Alexandru Avadanii [Fri, 2 Mar 2018 19:11:47 +0000 (20:11 +0100)]
config/installers: Adopt j2 'do' extension
Change-Id: Iffc473a4c90ff4ee8cfbcc304a3462559199fbe0
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Fri, 2 Mar 2018 21:55:02 +0000 (22:55 +0100)]
[fuel] Fix missing space between yaml key:val
Change-Id: Icf0e5d386f593bb691f777704ac799c8729221ce
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Fri, 2 Mar 2018 17:29:53 +0000 (18:29 +0100)]
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>
Alexandru Avadanii [Fri, 2 Mar 2018 16:36:58 +0000 (16:36 +0000)]
Merge "config/utils: YAML: Use C bindings if available"
Alexandru Avadanii [Thu, 1 Mar 2018 22:47:31 +0000 (23:47 +0100)]
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>
Alexandru Avadanii [Thu, 1 Mar 2018 19:57:23 +0000 (20:57 +0100)]
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>
Alexandru Avadanii [Thu, 1 Mar 2018 18:57:34 +0000 (19:57 +0100)]
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>
Alexandru Avadanii [Tue, 27 Feb 2018 13:42:47 +0000 (13:42 +0000)]
Merge "[fuel] Improved IP handling on config template"
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>
Guillermo Herrero [Fri, 2 Feb 2018 15:35:21 +0000 (16:35 +0100)]
[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>
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>
Julien [Mon, 5 Feb 2018 07:31:45 +0000 (15:31 +0800)]
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>
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
agardner [Wed, 10 Jan 2018 19:06:41 +0000 (14:06 -0500)]
Auto Generated INFO.yaml file
A programmatic way of determining project lead is needed for the Testapi app
And will be used to grant ptl's additional ops
This file was auto generated from an ldap lookup and this
projects INFO file
(part of the)spaghetti code:
https://gist.github.com/anonymous/
85a395b22911ed9f04dd4bf61bff9dc2
This is as good as I can get the output
Project leads will need to be asked to clean up the rest
Community discussion will be held at the
Weekly+Technical+Discussion on February 01
Change-Id: I562a486b70f4f0fecd0275c22fe4030097e39c3e
Signed-off-by: agardner <agardner@linuxfoundation.org>
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"