summaryrefslogtreecommitdiffstats
path: root/docs/submodules/pharos
diff options
context:
space:
mode:
authorAric Gardner <agardner@linuxfoundation.org>2018-01-15 21:37:12 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-01-15 21:37:12 +0000
commit4e352785139a2a79b8abe76fa11358a41a30b02f (patch)
tree0bb1ee471c2488e5f7125be5d58721fab5a26390 /docs/submodules/pharos
parent18c0fe1ec3944d032d6bec45812a15c2028ac678 (diff)
Update git submodules
* Update docs/submodules/pharos from branch 'master' - 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 - [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> - [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> - [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> - [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>
Diffstat (limited to 'docs/submodules/pharos')
m---------docs/submodules/pharos0
1 files changed, 0 insertions, 0 deletions
diff --git a/docs/submodules/pharos b/docs/submodules/pharos
-Subproject 668b3ab90304112143b35ebf5c82b565d3d0d84
+Subproject b1a499e5eaed826d3149298b7638aa90521159a