summaryrefslogtreecommitdiffstats
path: root/docs/submodules/pharos
AgeCommit message (Collapse)AuthorFilesLines
2018-01-22Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "[PDF] config: Add/update license headers" - [PDF] config: Add/update license headers This only covers the `config` subdir. Change-Id: I1fb9470e216cc2de9a4ac91de44d99e7044e708e Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-22Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "arm-pod7: add new PDF and IDF files" - arm-pod7: add new PDF and IDF files - net_config is moved to IDF file; - rename 'disk' to 'disks'; - add 'name: nicN' to interface; - add 'disk_rotation: 0' for ssd drivers; Change-Id: I1ea91a65abeb9db4f2f73f25ce51cd059b4b4753 Signed-off-by: ting wu <ting.wu@enea.com>
2018-01-22Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - [fuel] Add proxy node management network VIP Change-Id: I5fd74163cab8f6ee5f575ed72edfcc6919e60161 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - [fuel] Update MaaS PXE config - 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>
2018-01-16Update git submodulesJack Morgan1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "Committers standing down" - Committers standing down I am removing the following committers who are standing down.. Jose Lausuch Morgan Richomme Wenjing Chu Change-Id: I1cc451cc9a4c4598262ce913a1b34a2a656b9d61
2018-01-16Update git submodulesAlex Yang1-0/+0
* Update docs/submodules/pharos from branch 'master' - Fix daisy gateway generated by PDF Fixed_ips were removed from the PDF. So we need get gateway address from the 'interfaces'. Change-Id: Ie6adbf4ef3cbde05bb2fb114a58395dda8ae50fb Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2018-01-15Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge changes from topics 'pdf-spec-update', 'pdf-schema' * changes: [PDF] [SPEC] disk_interface: Add 'scsi', 'iscsi' [PDF] [SPEC] Align interface keys for NIC names [PDF] [SPEC] Extend disk_rotation enum with '0' [PDF] Add schema validation - [PDF] [SPEC] disk_interface: Add 'scsi', 'iscsi' zte-pod3 and ericsson-pod1 define their disk interfaces as (i)SCSI. Change-Id: I97945f7a41eec4e8a38de544af95ce4af82df200 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - [PDF] [SPEC] Align interface keys for NIC names Jumpserver and cluster nodes use different keys for defining the NIC name ('nic' vs 'name'), switch all of them to 'name' for uniformity. Change-Id: I2d7720f5e5349ef59cf76a0e07749cfbd0d34d0b Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - [PDF] [SPEC] Extend disk_rotation enum with '0' ssd and nvme drives are static, so extend the list of accepted disk_rotation values to accomodate this. Use '0' so the enum can still be parsed as a numeric value. Change-Id: Ib8ef8cceb495c7eb588c68d151690747463167f5 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - [PDF] Add schema validation - create new YAML schema for PDF validation; - add basic python script for checking a PDF against the schema; - add bash wrapper for checking all PDFs in Pharos, to be leveraged later via a new verify CI job; Change-Id: I47e02642756b7a231138dec3d5258b100b4db72b Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-15Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge changes from topic 'fix-pdf-spec-deviations' * changes: [PDF] zte-pod*: Fix spec deviations [PDF] lf-pod*: Fix spec deviations [PDF] intel-pod*: Fix spec deviations [PDF] ericsson-pod*: Fix spec deviations [PDF] bii-pod*: Fix spec deviations [PDF] arm-pod*: Fix spec deviations - [PDF] zte-pod*: Fix spec deviations - add dummy address/mac_address for jumpserver remote_management; - add 'name: nicN' to jumpserver & node interfaces; - zte-pod{2,9}: Fix disk_rotation out-of-enum: s/10500/10000/; Change-Id: I9548d48efb95226d888981e00df98db738d62d9d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - [PDF] lf-pod*: Fix spec deviations - disk_rotation: 0 for SSD drives; - add 'name: nicN' to jumpserver & node interfaces; Change-Id: I98253c0402bf1a4080a9e34bea547a7b8f6fa60e Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - [PDF] intel-pod*: Fix spec deviations - rename interface name key from 'nic' to 'name'; - disk_rotation: 0 for SSD drives; - details: change type to 'production' (typo?); Change-Id: I069c0fbe774f7c92acba90d434e384733264358d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - [PDF] ericsson-pod*: Fix spec deviations - rename interface name key from 'nic' to 'name'; - remove empty 'address' from interfaces; - ericsson-pod2: Use proper interface features separator; Change-Id: Idde907dc1c3db2febbfb224faf8232eea42c5ad7 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - [PDF] bii-pod*: Fix spec deviations - add 'name: nicN' to jumpserver & node interfaces; - fix 'pod_owner' key name; Change-Id: I6136fc066e615c226a2f57d566a2938b8f883f49 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - [PDF] arm-pod*: Fix spec deviations - disk_rotation: 0 for SSD drives; - rename 'disk' to 'disks'; - add 'name: nicN' to jumpserver & node interfaces; Change-Id: I17d8e64f9b7c5b236d2494566e24bac91f1fc914 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-15Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge changes from topic 'move-net_config-idf' * changes: [PDF] Daisy, Fuel: Drop support for PDF net_config [PDF] zte-pod*: Move net_config to IDF [PDF] lf-pod*: Drop 'fixed_ips' [PDD] ericsson-pod*: Move net_config to IDF [PDF] bii-pod*: Move net_config to IDF [PDF] arm-pod*: Move net_config to IDF [PDF] Daisy, Fuel: Add support for IDF net_config - [PDF] Daisy, Fuel: Drop support for PDF net_config Change-Id: I889db9a4663f1b2740207e6c25dc8d09645a3708 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - [PDF] zte-pod*: Move net_config to IDF Drop 'fixed_ips', which is a leftover from early net_config implementation. To maintain compatibility with the only 'fixed_ips' consumer (Daisy), add 'address' on the first jumpserver interface to leverage Daisy's fallback path for determining the gateway. While at it, add/update copyright headers. Change-Id: I7c4cb5997e368503ab0b30903e5c0c58e13fe408 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - [PDF] lf-pod*: Drop 'fixed_ips' Drop 'fixed_ips', which is a leftover from early net_config implementation. To maintain compatibility with the only 'fixed_ips' consumer (Daisy), add 'address' on the first jumpserver interface to leverage Daisy's fallback path for determining the gateway. While at it, add/update copyright headers. Fixes: c01d68e Change-Id: I8dc386535a20d64593eccc9abd8ee8d1ef27decf Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - [PDD] ericsson-pod*: Move net_config to IDF Change-Id: Ide79f18bae20e599eeefe13f4ad2dba1f4a0207d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - [PDF] bii-pod*: Move net_config to IDF Drop 'fixed_ips', which is a leftover from early net_config implementation. Rework the contents of 'fixed_ips' using the standard PDF spec 'address' parameter. Change-Id: Ife2c1c4b0c97479e962a32fa7825864c94e9a80c Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - [PDF] arm-pod*: Move net_config to IDF While at it, drop 'fixed_ips', which is a leftover from early net_config implementation and is not currently used by the Fuel installer (only Daisy seems to use 'fixed_ips', but falls back to using 'address' of the first interface when 'fixed_ips' is not present). Keep 'address: 192.168.11' on jumpserver first interface for Daisy compatibility. Change-Id: I83455a45a2a19fde6b9fb8b7f0fa8872b1291ab0 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - [PDF] Daisy, Fuel: Add support for IDF net_config - 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>
2018-01-15Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "[PDF] check-jinja: cleanup, compact output" - [PDF] check-jinja: cleanup, compact output The Pharos git repo already has a CI verify job for `yamllint`-ing the PDF files (check-jinja input yaml), so drop that check and keep linting only output YAML files. While at it, slightly rework the output log to make it easier to read. Change-Id: I2e47902d71514709eb48432f87d6ce68fb795d73 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-15Update git submodulesAric Gardner1-0/+0
* 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>
2018-01-15Update git submoduleswutianwei1-0/+0
* Update docs/submodules/pharos from branch 'master' - Add the huawei-pod1 PDF and IDF it include the information about the huawei-pod1 such as, cpu, memory, disk, interface, BMC and encrypt the ipmi user and password Change-Id: Ie93a84bc3953f7c35514813e99334adb260efed1 Signed-off-by: wutianwei <wutianwei1@huawei.com>
2018-01-14Update git submodulesjulien zhang1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "support gen DHA/NETWORK yaml by pdf" - support gen DHA/NETWORK yaml by pdf Change-Id: I8e0d88da016801e7997b4cdf870e2d11b4fca80a Signed-off-by: 00184532 <lu.yao135@zte.com.cn>
2018-01-12Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - [PDF] lf-pod{2,5}: Revert IPMI creds to plaintext LF PODs IPMI user/pass was previously encrypted with the wrong key, switch them back to cleartext. Change-Id: Iccd106b60d2051acf7d928205bd2f6ae3f256884 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-12Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - [PDF] arm-pod6: dos2unix IDF to fix yamllint JIRA: PHAROS-298 Change-Id: Ied56d4e1fdf09d3361de5aae64088e65cb5125ad Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-10Update git submodulesGuillermo Herrero1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "[fuel] add main check for idf.fuel" - [fuel] add main check for idf.fuel - 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>
2018-01-10Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge ".yamllint: Add initial config based on releng" - .yamllint: Add initial config based on releng Change-Id: I5a22a186d87a2389e637771628e0a7d0522b7b77 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-10Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "PDF is not to contain net_config" - PDF is not to contain net_config Moved net_config from PDF to IDF for discussion on what the idf should look like The PDF spec is static and should not change. All changes needed for installers should be put in other descriptor files. (senario and installer descriptor files) Change-Id: I79f6c751cabc69bded255ce0471e8512c656c259 Signed-off-by: agardner <agardner@linuxfoundation.org>
2018-01-09Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "Fix First MAC Address on LF-POD5 Jumphost" - Fix First MAC Address on LF-POD5 Jumphost Change-Id: Ibdf3ea886fcfca8246cd8cb24d52d12b689a733b Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-01-09Update git submodulesJack Morgan1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "nominate Trevor Bramwell as a Pharos committer" - nominate Trevor Bramwell as a Pharos committer I would like to nominate Trevor Bramwell as a committer to the Pharos project. Trevor has been an active contributor to the Pharos project over the last few months. Please provide a +1/-1 vote before the end of next week, Dec. 31st Change-Id: I8c7d09e67a86c814bb89beac878da74a03bdd1c4
2018-01-09Update git submodulesJack Morgan1-0/+0
* Update docs/submodules/pharos from branch 'master' - nominate Aric Gardner as a Pharos committer I would like to nominate Aric Gardner as a committer to the Pharos project. Aric has been an active contributor to the Pharos project over the last few months. Please provide a +1/-1 vote before the end of next week, Dec. 31st Change-Id: Ia381c93bd46053891195f8740d43cd4b010bef42
2018-01-09Update git submodulesJack Morgan1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "nominate Parker Berberian as a Pharos committer" - nominate Parker Berberian as a Pharos committer I would like to nominate Parker Berberian as a committer to the Pharos project. Parker has been an active contributor to the Pharos project over the last few months. His foxus on the Pharos Dashboard will be key to reaching community goals. Please provide a +1/-1 vote before the end of next week, Dec. 31st Change-Id: Iee363751fd06a12a4e16b8a638e821ea274a7f96
2018-01-09Update git submodulesJack Morgan1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "nominate Guillermo Herrero as a Pharos committer." - nominate Guillermo Herrero as a Pharos committer. I would like to nominate Guillermo Herrero as a committer to the Pharos project. Guillermo has been an active contributor to the Pharos project over the last few months. Please provide a +1/-1 vote before the end of next week, Dec. 31st Change-Id: I452c1eb1050932accdf312226d4808f41d574ee3
2018-01-09Update git submodulesJack Morgan1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "nominate Alexandru Avadanii as a Pharos committer " - nominate Alexandru Avadanii as a Pharos committer I would like to nominate Alexandru Avadanii as a committer to the Pharos project. Alexandru Avadanii has been an active contributor to the Pharos project over the last few months. Please provide a +1/-1 vote before the end of next week, Dec. 31st Change-Id: I192c87b6a36b2981cdfb4c780bd1fff9152201a8
2018-01-08Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "PDF: Fix recurring typo in 'haswell' name" - PDF: Fix recurring typo in 'haswell' name Fix typo before it gets propagated even more: $ grep hasewell -Rl . | \ xargs sed -i 's/hasewell/haswell/g' Change-Id: Id6a17ae8f429946f7febba6f319a25759fc8339f Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-08Update git submodulesAlex Yang1-0/+0
* Update docs/submodules/pharos from branch 'master' - Fix the VIP of daisy VIP can not conflict with the address of any node. Otherwise the deployment will fail. See [1]. [1]: https://build.opnfv.org/ci/job/daisy-deploy-baremetal-daily-master/359 Change-Id: I53a79c478d355d00b6eec16c462694eab68292d7 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2018-01-04Update git submodulesAlex Yang1-0/+0
* Update docs/submodules/pharos from branch 'master' - Add admin external network mapping for daisy The admin external network mapping is used by post deploy script in daisy to create network. Change-Id: I4bdde9ca52d8932f77e91b8bf7d41b0c2e821a20 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-12-20Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "modify admin network segment of zte pod1" - modify admin network segment of zte pod1 The previous network segment conflicts with INSTALLER_IP. Change-Id: I160c2ee368f716d13510bfea69e2dc453d164276 Signed-off-by: zhihui wu <wu.zhihui1@zte.com.cn>
2017-12-20Update git submodulesagardner1-0/+0
* Update docs/submodules/pharos from branch 'master' - validate-pdf-jinja2-templates-master failing If keys do not exist, the skipping decryption python stuff doesn't work, see: https://build.opnfv.org/ci/job/validate-pdf-jinja2-templates-master/16/consoleFull Still does not fallback to plain in the case of a 'bad decryption', but the current code does not either, bad decryption is logged in any case. Change-Id: I8da2c7cf8568a6e77ca24cc9ce665410d93b7ba9 Signed-off-by: agardner <agardner@linuxfoundation.org>
2017-12-15Update git submodulesJack Morgan1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "Linux Foundation POD5 PDF" - Linux Foundation POD5 PDF Change-Id: I0c4389059edb33fecdd472777d7266c4934f1d07 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2017-12-15Update git submodulesJack Morgan1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "Moving all pdfs to pharos repo" - Moving all pdfs to pharos repo Inline encrytion of yaml files allows us to make away with securedlab's restrictions. Going forward, anyone will be able to see Lab PDFs See: https://github.com/opnfv/pharos/blob/master/config/utils/README.eyaml.rst If you are the reviewer on this changeset it is becasue git blamed showed you to be the author of the pdf in this review. Encrypting ipmi password is optional. I have scrubbed the password from this change. If you do not need the password to be hidden, please let me know in the comment, and I will put it back. If you do need the password hidden, please follow the readme above and ammend this patch to include the encrypted value that you create on your pods jumphost. Change-Id: I52a5c117da599fd46aa246de20077d5bdbe8a3b6 Signed-off-by: agardner <agardner@linuxfoundation.org>
2017-12-15Update git submodulesJack Morgan1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "Moving all pdfs to pharos repo" - Moving all pdfs to pharos repo Inline encrytion of yaml files allows us to make away with securedlab's restrictions. Going forward, anyone will be able to see Lab PDFs See: https://github.com/opnfv/pharos/blob/master/config/utils/README.eyaml.rst If you are the reviewer on this changeset it is becasue git blamed showed you to be the author of the pdf in this review. Encrypting ipmi password etc is optional. I have scrubbed the password from this change. If you do not need the password to be hidden, please let me know in the comment, and I will put it back. If you do need the password hidden, please follow the readme above and ammend this patch to include the encrypted value that you create on your pods jumphost. Change-Id: Idc70540477d8569f15335e75e7725c1e4e56a60b Signed-off-by: agardner <agardner@linuxfoundation.org>
2017-12-15Update git submodulesJack Morgan1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "Update the example config filename in eyaml README" - Update the example config filename in eyaml README The example configuration file in the directory pharos/config/utils/ is config.example.yaml. Change-Id: I493274e4ddb689eb729ed642b5f495b5be0b75b0 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-12-15Update git submodulesJack Morgan1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "Encrypt ipmi info of zte baremetal pods" - Encrypt ipmi info of zte baremetal pods Change-Id: I86935bee9ff30d811f0e756f93716cb415fa3a01 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-12-15Update git submodulesJack Morgan1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "Generate daisy network configuration by template" - Generate daisy network configuration by template JIRA: DAISY-74 Add jinja2 templates for daisy network configuration. For DPDK, TENANT and EXTERNAL networks should share the same interface now. Change-Id: I6e9b7a68fb572e9ad844cfcc6ff383aaa25e3bc1 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-12-14Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "Update eyaml README" - Update eyaml README On CentOS7 systems the gem command is contained in the 'rubygems' package, not 'ruby-gems'. After the keys have been moved, there is not reason to keep around the 'keys' directory. Change-Id: I5cb9f474276de75b650ddf323a279e139fb62d37 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2017-12-14Update git submodulesJack Morgan1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "Moving all pdfs to pharos repo" - Moving all pdfs to pharos repo Inline encrytion of yaml files allows us to make away with securedlab's restrictions Going forward, anyone will be able to see Lab PDFs See: https://github.com/opnfv/pharos/blob/master/config/utils/README.eyaml.rst If you are the reviewer on this changeset it is becasue git blamed showed you to be the author of the pdf in this review. Encrypting ipmi password is optional. I have scrubbed the password from this change. If you do not need the password to be hidden, please let me know in the comment, and I will put it back. If you do need the password hidden, please follow the readme above and ammend this patch to include the encrypted value that you create on your pods jumphost. Change-Id: Ic2db523e7f82a0fb48e462a1fbe1402267f22618 Signed-off-by: agardner <agardner@linuxfoundation.org>
2017-12-14Update git submodulesJack Morgan1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "Moving all pdfs to pharos repo" - Moving all pdfs to pharos repo Note: Also fixed yamllint issues with these files Inline encrytion of yaml files allows us to make away with securedlab's restrictions. Going forward, anyone will be able to see Lab PDFs See: https://github.com/opnfv/pharos/blob/master/config/utils/README.eyaml.rst If you are the reviewer on this changeset it is becasue git blamed showed you to be the author of the pdf in this review. Encrypting ipmi password etc is optional. I have scrubbed the password from this change. If you do not need the password to be hidden, please let me know in the comment, and I will put it back. If you do need the password hidden, please follow the readme above and ammend this patch to include the encrypted value that you create on your pods jumphost. Passwords and Usernames removed: $ egrep -r '(pass|user)' zte/pod2/daisy/config/deploy.yml: ipmi_user: zte/pod2/daisy/config/deploy.yml: ipmi_pass: zte/pod2/daisy/config/deploy.yml: ipmi_user: zte/pod2/daisy/config/deploy.yml: ipmi_pass: zte/pod2/daisy/config/deploy.yml: ipmi_user: zte/pod2/daisy/config/deploy.yml: ipmi_pass: zte/pod2/daisy/config/deploy.yml: ipmi_user: zte/pod2/daisy/config/deploy.yml: ipmi_pass: zte/pod2/daisy/config/deploy.yml: ipmi_user: zte/pod2/daisy/config/deploy.yml: ipmi_pass: zte/pod2/daisy/config/deploy.yml:daisy_passwd: '' zte/virtual1/daisy/config/deploy.yml:daisy_passwd: '' zte/pod3.yaml: user: zte/pod3.yaml: pass: zte/pod3/daisy/config/deploy.yml: ipmi_user: zte/pod3/daisy/config/deploy.yml: ipmi_pass: zte/pod3/daisy/config/deploy.yml: ipmi_user: zte/pod3/daisy/config/deploy.yml: ipmi_pass: zte/pod3/daisy/config/deploy.yml: ipmi_user: zte/pod3/daisy/config/deploy.yml: ipmi_pass: zte/pod3/daisy/config/deploy.yml: ipmi_user: zte/pod3/daisy/config/deploy.yml: ipmi_pass: zte/pod3/daisy/config/deploy.yml: ipmi_user: zte/pod3/daisy/config/deploy.yml: ipmi_pass: zte/pod3/daisy/config/deploy.yml:daisy_passwd: '' zte/pod1.yaml: user: zte/pod1.yaml: pass: zte/virtual2/daisy/config/deploy.yml:daisy_passwd: '' zte/pod2.yaml: user: zte/pod2.yaml: pass: lf/pod2.yaml: user: > Change-Id: I876f4b553c51dd4592701539cfce66bcf8c114ab Signed-off-by: agardner <agardner@linuxfoundation.org>
2017-12-13Update git submodulesJack Morgan1-0/+0
* Update docs/submodules/pharos from branch 'master' - Updating the INFO fill with names and email address. Removing Qiao Fu who is no longer able to participate in project. Change-Id: I4bfcb378f3a5da6af59292f8911fa8fc8200cbae
2017-12-11Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "[fuel] extend public gateway support" - [fuel] extend public gateway support JIRA: FUEL-305 Change-Id: Ic5a2d499925aeec5b597394a059640ddae83fb2d Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
2017-12-11Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "[fuel] Add MaaS PXE network to installer adapter" - [fuel] Add MaaS PXE network to installer adapter JIRA: FUEL-313 Change-Id: I046ea732e1047f793f1b3bc6f7fc31cfcee9ff40 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-12-11Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "[fuel] Add IDF mappings to installer adapter" - [fuel] Add IDF mappings to installer adapter Change-Id: I3a82ed747d2671510a25e65388c7f73ec760afc3 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-12-11Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - [fuel] cleanup: Drop infra_compute_*_address 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>
2017-12-09Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - generate_config.py: Fix running without eyaml If eyaml is not installed or misconfigured, we should output raw encrypted data and throw a warn/error accordingly, instead of bailing out completely. Needed for Fuel deploys on PODs that do not use PDF encryption, e.g. lf-pod2. Change-Id: I2905df11a3cf2f2eb1ab9bfd8bd88619af2cab04 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-12-07Update git submodulesJack Morgan1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "Moving all pdfs to pharos repo" - Moving all pdfs to pharos repo Inline encrytion of yaml files allows us to make away with securedlab's restrictions Going forward, anyone will be able to see Lab PDFs See: https://github.com/opnfv/pharos/blob/master/config/utils/README.eyaml.rst If you are the reviewer on this changeset it is becasue git blamed showed you to be the author of the pdf in this review. Encrypting ipmi password is optional. I have scrubbed the password from this change. If you do not need the password to be hidden, please let me know in the comment, and I will put it back. If you do need the password hidden, please follow the readme above and ammend this patch to include the encrypted value that you create on your pods jumphost. Change-Id: Ie3e935e7e9250a387858c29eb77c3c06b4fe3f57 Signed-off-by: agardner <agardner@linuxfoundation.org>
2017-12-07Update git submodulesJack Morgan1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "[fuel] IPMI: Trim netmask from IP passed to MaaS" - [fuel] IPMI: Trim netmask from IP passed to MaaS Change-Id: I683788846a716f1af6ae8aa3b25cc3a866ae0045 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-12-07Update git submodulesJack Morgan1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "[fuel] Use PXE interface index from net_config" - [fuel] Use PXE interface index from net_config 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>
2017-11-24Update git submodulesagardner1-0/+0
* Update docs/submodules/pharos from branch 'master' - Jenkins does not have /usr/local/bin/ in path Stupid jenkins Change-Id: Ibfd83e7dadd674cfe7d7a9c2a712ef069fb8d5de Signed-off-by: agardner <agardner@linuxfoundation.org>
2017-11-24Update git submodulesagardner1-0/+0
* Update docs/submodules/pharos from branch 'master' - Moving check-jinja2 to pharos. Securedlab will be going away now that we can encrypt strings (eyaml) we need to check jinja2 PDF templates that will be moving into pharos This adds one pod yaml files and fixes paths in check-jinja2.sh After this is merged I can create a jenkins job for pharos. Then I can start moving pdf files into the pharos repo Change-Id: I2f2f2925275de49035d7d0160249d75b25ca0d20 Signed-off-by: agardner <agardner@linuxfoundation.org>
2017-11-22Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "generate_config: Use eyaml to decrypt secret values" - generate_config: Use eyaml to decrypt secret values Note: IDF data encryption is not supported. Supporting that is trivial, but it leads to slightly more complicated code, plus it breaks support for multiline scalar encrypted data in the PDF ('>'), forcing us to define each encrypted value as inline string. While at it, fix silly limitation of jinja2 path residing in a subdir of CWD. Change-Id: I441ec754d8b6e4aad2ed73aba0b9b18ed65f05f4 Signed-off-by: agardner <agardner@linuxfoundation.org> Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-11-22Update git submodulesAlex Yang1-0/+0
* Update docs/submodules/pharos from branch 'master' - Fix yamllint warning for daisy template Change-Id: I4b9a9a569d22570f027a49bc31736f6787177171 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>