Age | Commit message (Collapse) | Author | Files | Lines |
|
For non-Debian systems, proto 'manual' is not a valid choice and
we should be able to override it.
e.g.: For CentOS, proto 'none' should be used instead.
Change-Id: Id1b6d9d51de17ede0c1e2fdc7f845d74b2a4ab9d
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
Some upcoming scenarios do not define any compute nodes, so
skip adding the nodes to MaaS machine list too.
Change-Id: I895d8c7cb54783a57667d20f672b8ff870105cfc
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
Our hardcoded index for the compute role interferes with PODs
having less than the hardcoded expected node count.
Change-Id: Icb8915c257d2e3305793397a51b00f96ed260c5f
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
VPP requires 1G pagesizes on ThunderX nodes, so switch from 2M to 1G
when DPDK is used.
While at it, extend the Fuel j2 macro to accomodate different naming
of virtual function network devices based on the driver used (vfio).
Change-Id: Ic29ce04867955282b6f988ed69a44b316ffdc994
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
ethtool reports the link speed as 'unknown' for said devices.
The only (current) consumer of this information is Fuel's new VPP
support, which detects all these interfaces as 'Gigabit', so align
our definitions in order to be able to dynamically construct the
VPP interface names based on PDF (link speed) + IDF (PCI bus).
While at it, add a new j2 macro helper to be used by Fuel installer.
Change-Id: Id6a52bbb7b86bbe3db2a81bb91ac378c6876ffc0
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
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>
|
|
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>
|
|
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>
|
|
Change-Id: Ifcfd806d568c3cda375166b9c63381f66ee375c4
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
Change-Id: Ib4859e4ada3d72e7e848114620ff5405c26b3126
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
- 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>
|
|
- 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>
|
|
- 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>
|
|
Change-Id: Iffc473a4c90ff4ee8cfbcc304a3462559199fbe0
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
Change-Id: Icf0e5d386f593bb691f777704ac799c8729221ce
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
-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>
|
|
Related to: https://gerrit.opnfv.org/gerrit/#/c/52043/
Change-Id: I8378070f9efedc24229efc3c3d5542b62808e1e6
Signed-off-by: Delia Popescu <delia.popescu@enea.com>
|
|
Change-Id: I23446e82dd148afd14d56717dd35fe0ee271d971
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* changes:
[fuel] Add net_map.j2 for net config abstraction
[fuel] Explicitly blacklist incompatible labs
[IDF] Add optional 'idf.installer' array
|
|
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>
|
|
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>
|
|
- 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>
|
|
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>
|
|
Fixes: 4cef6b2
Change-Id: I628ce8da7e0959ff916082c1fc30934dca0d93dc
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
|
|
|
|
Change-Id: I5fd74163cab8f6ee5f575ed72edfcc6919e60161
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
- 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>
|
|
- 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>
|
|
Change-Id: I889db9a4663f1b2740207e6c25dc8d09645a3708
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
- 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>
|
|
This only covers the `config` subdir.
Change-Id: I1fb9470e216cc2de9a4ac91de44d99e7044e708e
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
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>
|
|
- 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>
|
|
|
|
|
|
|
|
JIRA: FUEL-313
Change-Id: I046ea732e1047f793f1b3bc6f7fc31cfcee9ff40
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
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>
|
|
Change-Id: I3a82ed747d2671510a25e65388c7f73ec760afc3
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
JIRA: FUEL-305
Change-Id: Ic5a2d499925aeec5b597394a059640ddae83fb2d
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
|
|
|
|
|
|
Instead of assuming the PXE network interface is always the first,
read its index from 'net_config' section.
Change-Id: I0b4e9fc89297f4bd718a2e5336746917347c89e1
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
Change-Id: I683788846a716f1af6ae8aa3b25cc3a866ae0045
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
Change-Id: I8d4cc9505eb1d405b8f6a3ef1053249d803bda7b
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
|
|
Change-Id: I848f13acca08c4c8a24eeecd3554ea6d50bbb565
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
|
|
Change-Id: I4ff233460bb4fbd88277f2798f5f6380ff3b367d
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
|
|
v3 -> v4:
- extract common variable refs, fold some reusable code;
- provide dummy defaults for PDFs without net_config;
- keep yamllint happy about spaces and empty lines;
v4 -> v5:
- more folding, define a macro for multiple IP address definition;
v5 -> v6:
- added MaaS network / DHCP range support;
v6 -> v7:
- removed macro, template code reverted to output style
JIRA: FUEL-275
Change-Id: Ib1cc319534d06c088b1db16a43aef663a8ada0d8
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|