summaryrefslogtreecommitdiffstats
path: root/config
AgeCommit message (Collapse)AuthorFilesLines
2017-12-15Merge "Update the example config filename in eyaml README"Jack Morgan1-1/+1
2017-12-15Merge "Generate daisy network configuration by template"Jack Morgan2-0/+204
2017-12-15Update the example config filename in eyaml READMEAlex Yang1-1/+1
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-13Update eyaml READMETrevor Bramwell1-1/+2
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-11Merge "[fuel] extend public gateway support"Aric Gardner1-0/+9
2017-12-11Merge "[fuel] Add MaaS PXE network to installer adapter"Aric Gardner1-0/+5
2017-12-11Merge "[fuel] Add IDF mappings to installer adapter"Aric Gardner1-0/+7
2017-12-11[fuel] Add MaaS PXE network to installer adapterAlexandru Avadanii1-0/+5
JIRA: FUEL-313 Change-Id: I046ea732e1047f793f1b3bc6f7fc31cfcee9ff40 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-12-10[fuel] cleanup: Drop infra_compute_*_addressAlexandru Avadanii1-3/+0
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-09generate_config.py: Fix running without eyamlAlexandru Avadanii1-3/+7
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-07[fuel] Add IDF mappings to installer adapterAlexandru Avadanii1-0/+7
Change-Id: I3a82ed747d2671510a25e65388c7f73ec760afc3 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-12-07[fuel] extend public gateway supportGuillermo Herrero1-0/+9
JIRA: FUEL-305 Change-Id: Ic5a2d499925aeec5b597394a059640ddae83fb2d Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
2017-12-07Merge "[fuel] IPMI: Trim netmask from IP passed to MaaS"Jack Morgan1-5/+5
2017-12-07Merge "[fuel] Use PXE interface index from net_config"Jack Morgan1-2/+2
2017-12-06Generate daisy network configuration by templateAlex Yang2-0/+204
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-11-24Jenkins does not have /usr/local/bin/ in pathagardner1-0/+1
Stupid jenkins Change-Id: Ibfd83e7dadd674cfe7d7a9c2a712ef069fb8d5de Signed-off-by: agardner <agardner@linuxfoundation.org>
2017-11-23Moving check-jinja2 to pharos.agardner1-0/+66
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-22Merge "generate_config: Use eyaml to decrypt secret values"Aric Gardner4-4/+376
2017-11-20Fix yamllint warning for daisy templateAlex Yang1-40/+51
Change-Id: I4b9a9a569d22570f027a49bc31736f6787177171 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-11-17generate_config: Use eyaml to decrypt secret valuesAlexandru Avadanii4-4/+376
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-10-27[fuel] Use PXE interface index from net_configAlexandru Avadanii1-2/+2
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-10-27[fuel] IPMI: Trim netmask from IP passed to MaaSAlexandru Avadanii1-5/+5
Change-Id: I683788846a716f1af6ae8aa3b25cc3a866ae0045 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-10-25[fuel] Assign public network to proxy nodesMichael Polenchuk1-3/+3
Change-Id: I8d4cc9505eb1d405b8f6a3ef1053249d803bda7b Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-10-01Merge "PDF: generate_config: Add IDF parsing support"Jack Morgan1-0/+8
2017-09-27Updated fuel adapter (vlan1000, interfaces format)Guillermo Herrero1-6/+7
Change-Id: I848f13acca08c4c8a24eeecd3554ea6d50bbb565 Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
2017-09-26Merge "Updated fuel adapter (ODL)"Jack Morgan1-5/+8
2017-09-26Move POD descriptor file template to its own directory (pdf/pod1/yaml)Jack Morgan1-0/+0
Change-Id: Ibb481d57e3c154c409c2635096330f2e63dce9db Signed-off-by: Jack Morgan <jack.morgan@intel.com>
2017-09-26Updated fuel adapter (ODL)Guillermo Herrero1-5/+8
Change-Id: I4ff233460bb4fbd88277f2798f5f6380ff3b367d Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
2017-09-26PDF: generate_config: Add IDF parsing supportAlexandru Avadanii1-0/+8
For a given 'podN.yaml' file, check whether a file named 'idf-podN.yaml' exists in the same directory, and if it does, pass its contents under the 'idf' dict key to the j2 template. This assumes the contents of IDF yaml have a root 'idf' key. Change-Id: I6c6f1b9f28c38989f8a6ed4a389c9a1da423d76d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-09-25Add fuel installer adapterGuillermo Herrero1-0/+114
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>
2017-09-21config/pod1.yaml: Typo fixes, add 3 new nodesAlexandru Avadanii1-10/+100
In order to be able to check the PDF template against the current installer adapters, we need to fill in all 5 nodes info. While at it, perform some cleanup: - s/remoteparas/remote_paramsg/ (installers use this directly ...); - s/remote_mangement/remote_management/g; - s/pod owner/pod_owner/; - minor typo fixes; - fixed one IP overlap between 2 existing nodes; NOTE: Data for the 3 new nodes is bogus (random MACs, addresses). Change-Id: I63c6318659678771c34e139dd1db630c6b81b214 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-09-18config/installers: Add PDF installer adaptersAlexandru Avadanii15-0/+1322
Previously, PDF installer adapters resided in securedlab git repo, but since we want to be able to use it in both securedlab (for validation of new PDF files during verify jobs) and installer projects (for actually parsing the PDF file into usable installer inputs), we decided to move them to a common location, also available for regular users. This change merely replicates the current adapter files from securedlab git repo for the following projects: - apex; - compass4nfv; - daisy; - joid; Change-Id: Ic4bd75e1b2dc339c15cd4943dfc5a1c74c68b094 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-09-18config/utils: Add generate_config.pyAlexandru Avadanii1-0/+53
Previously, generate_config.py resided in securedlab git repo, but since we want to be able to use it in both securedlab (for validation of new PDF files during verify jobs) and installer projects (for actually parsing the PDF file into usable installer inputs), we decided to move it to a common location, also available for regular users. This change merely replicates the file from securedlab git repo. Change-Id: I9ff7889e408338d3911853fe01b752b013de1db7 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-06-27Fix Yamllint ViolationsTrevor Bramwell1-21/+41
JIRA: PHAROS-298 Change-Id: I1c9afc9bfee4a60144b95bc38e2333260c95167a Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2017-05-16Fix ipmi section to be valid yamlagardner1-3/+3
Change-Id: I04b5c5ead3b71c06549e9b385dcadacb79751ee4 Signed-off-by: agardner <agardner@linuxfoundation.org>
2017-02-13pod1.yaml for common configuration fileJack Morgan1-0/+136
modifications: 1. use list to replace fixed names; 2. use structure to avoid deplicated info; 3. rearrage the structure; 4. delete nic parameters from jumpserver 5. remove address and mac_address from remoteparas Change-Id: I4bc7e1ecf0321e852bbbe43c2ebc9a1291f7a78f Signed-off-by: Jack Morgan <jack.morgan@intel.com>