diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-12 19:45:21 +0100 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-14 18:02:30 +0100 |
commit | ff8a684abb229ce0160440291abb0e92604c809e (patch) | |
tree | c3005b4c179a6e0395529579cad5351f57563176 /config/installers/fuel/pod_config.yml.j2 | |
parent | 90e2b5ea413edb1f12d0f6fbcc58e7c68b2aaa57 (diff) |
[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>
Diffstat (limited to 'config/installers/fuel/pod_config.yml.j2')
-rw-r--r-- | config/installers/fuel/pod_config.yml.j2 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 index 06836e9f..bfcec091 100644 --- a/config/installers/fuel/pod_config.yml.j2 +++ b/config/installers/fuel/pod_config.yml.j2 @@ -1,4 +1,5 @@ -{%- if conf.idf.fuel is defined -%} +--- +{%- if conf.idf is defined and conf.idf.fuel is defined -%} {%- if conf.net_config is defined -%} {%- set net_admin = conf.net_config.admin.network -%} {%- set net_mgmt = conf.net_config.mgmt.network -%} @@ -28,8 +29,7 @@ {%- endif -%} {%- if net_public_gw is not defined -%} {%- set net_public_gw = net_public | ipaddr_index('1') -%} - {%- endif -%} ---- + {%- endif %} parameters: _param: |