Age | Commit message (Collapse) | Author | Files | Lines |
|
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>
|