summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-12-18Merge "generate_config.py: Fix running without eyaml" into stable/euphratesJack Morgan1-3/+7
2017-12-15generate_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> (cherry picked from commit 2db1004f456f4ed956246bc85049a69b39e8cab2)
2017-12-15Update 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> (cherry picked from commit cef924d0f6a1a8df8ad4d61b425e2a0b29e25027)
2017-12-15Merge "generate_config: Use eyaml to decrypt secret values" into ↵Jack Morgan4-4/+376
stable/euphrates
2017-12-15Merge "[fuel] Add IDF mappings to installer adapter" into stable/euphratesJack Morgan1-0/+7
2017-12-14[fuel] Add IDF mappings to installer adapterAlexandru Avadanii1-0/+7
Change-Id: I3a82ed747d2671510a25e65388c7f73ec760afc3 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit c59931889db99c4fe6fc308123e2085625c18c42)
2017-12-14[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> (cherry picked from commit 5aae093570a37ea91b8c11fa8e116deb1773abc2)
2017-12-14generate_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> (cherry picked from commit d2307b5afbf13644bfe6722018ef1975e92680d1)
2017-12-14Merge "Updated fuel adapter (ODL)" into stable/euphratesJack Morgan1-5/+8
2017-12-14Merge "[fuel] IPMI: Trim netmask from IP passed to MaaS" into stable/euphratesJack Morgan1-5/+5
2017-12-14Merge "[fuel] Assign public network to proxy nodes" into stable/euphratesJack Morgan1-3/+3
2017-12-14Merge "PDF: generate_config: Add IDF parsing support" into stable/euphratesJack Morgan1-0/+8
2017-12-13[fuel] IPMI: Trim netmask from IP passed to MaaSAlexandru Avadanii1-5/+5
Change-Id: I683788846a716f1af6ae8aa3b25cc3a866ae0045 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 845813111aba4c28af1acca32dc4b4f1b0640c19)
2017-12-13[fuel] Assign public network to proxy nodesMichael Polenchuk1-3/+3
Change-Id: I8d4cc9505eb1d405b8f6a3ef1053249d803bda7b Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> (cherry picked from commit af9e2a904ad7f1e44ba26cf9cebbc8bb3f7d8842)
2017-12-13PDF: 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> (cherry picked from commit e5c76e735a99395ab075f95c0f4105f8727a834e)
2017-12-13Updated fuel adapter (vlan1000, interfaces format)Guillermo Herrero1-6/+7
Change-Id: I848f13acca08c4c8a24eeecd3554ea6d50bbb565 Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com> (cherry picked from commit 908dab58edbbe8f22db14a9261693a54e9b2d8fd)
2017-12-13Updated fuel adapter (ODL)Guillermo Herrero1-5/+8
Change-Id: I4ff233460bb4fbd88277f2798f5f6380ff3b367d Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com> (cherry picked from commit eeb38b5a9e900d2e0e1e52276f6b2e533eee4b1c)
2017-12-07Add 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> (cherry picked from commit 25b2adb887b5e1cab767023476dd0ec2f02b4b59)
2017-12-07Merge "config/pod1.yaml: Typo fixes, add 3 new nodes" into stable/euphratesJack Morgan1-10/+100
2017-12-07Merge "config/installers: Add PDF installer adapters" into stable/euphratesJack Morgan15-0/+1322
2017-12-07Merge "config/utils: Add generate_config.py" into stable/euphratesJack Morgan1-0/+53
2017-10-02Add Version Field to PDFTrevor Bramwell1-0/+1
With Euphrates being the initial 'release' of the PDF it is important we include a version specifier. Without a version specifier, PDF consumers (computers or humans) won't know which fields are be available, nor their possible type (string, int, list, etc). This also allows the PDF spec to be modified without fear of breaking any tooling relying on the layout of fields or extance of specific properties; Presuming tooling handles the version specifier. Change-Id: I304ecc9ebfa0a36d40db8ef3486a3600ae86422e Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2017-09-22config/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> (cherry picked from commit 783a439ec2bd23ad969ffe7a3c6b7277f7a565c7)
2017-09-22config/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> (cherry picked from commit 1a1c03d865c55872d5912ac60ce4a1af5e814de2)
2017-09-22config/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> (cherry picked from commit 74cdf3ea93fb3a91ed03924fdb17076d36fc4cb9)
2017-09-14minor changesJulien1-1/+1
missing comments in https://gerrit.opnfv.org/gerrit/#/c/41711/ Change-Id: I718a2c5b06a38700f739fe23e36f535562c2a90d Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
2017-09-14Merge "Update requirements from ARM community"julien zhang1-1/+2
2017-09-14Merge "Update contents in E release"julien zhang7-95/+96
2017-09-12Update requirements from ARM communityJulien1-1/+2
Change-Id: Id221ade872bb7f38f406a2fb8ebc8651260b22bf Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
2017-09-12Update contents in E releaseJulien7-95/+96
correct some information like: links and descriptions delete unuseful information JIRA: PHAROS-311 Change-Id: I1fceaa13fbff540bcd3f314f4653c7cc8c485091 Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
2017-09-12Add PDF to documentJulien2-1/+19
Change-Id: Ib3d9f89b4556d91c2d7207eb109e18eafe6dfbd6 Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
2017-09-11Merge "Fix Booking API"julien zhang8-23/+17
2017-08-17restruct documents according to opnfvdocsJulien72-11/+11
Use only development and release for we don't have test codes for now. JIRA: PHAROS-311 Change-Id: Iacfcaba81a7a52e09cf999b8603cc9dc2f8f2b97 Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
2017-07-27Fix Booking APImaxbr8-23/+17
This fixes a server error for the booking REST api and some html errors. Change-Id: I86475967bbc8cd4c8f82f62e03789f1c9752d446 Signed-off-by: maxbr <maxbr@mi.fu-berlin.de>
2017-07-26Mount PostgreSQL Data from Persistent VolumeTrevor Bramwell3-2/+9
Each time the postgresql container is torn down the database is lost. By using a presistent volume managed outside of docker compose, the postgresql data can persist across updates and service restarts. The volume needs to exist before the postgres container can start: this is done with the 'make data' command. Note: postgres container creates a volume at /var/lib/postgresql/data. Mounting at this location ensures the data is persisted into the external volume. Change-Id: I958ba57fc735c594378d575bc7108bee0d30c1e3 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2017-07-11Merge "Adding Labels"julien zhang6-0/+12
2017-06-27Fix Yamllint ViolationsTrevor Bramwell12-234/+262
JIRA: PHAROS-298 Change-Id: I1c9afc9bfee4a60144b95bc38e2333260c95167a Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2017-06-10Merge "Fix ipmi section to be valid yaml"Jack Morgan1-3/+3
2017-05-16Fix ipmi section to be valid yamlagardner1-3/+3
Change-Id: I04b5c5ead3b71c06549e9b385dcadacb79751ee4 Signed-off-by: agardner <agardner@linuxfoundation.org>
2017-05-05Pharos Dashboard: Add manual resource managementmaxbr10-15/+63
Dev Pods are now managed by checking the "Dev pod" box in the Admin Panel. This commit also fixes a dead image URL and the oauth process for the dashboard URL. Change-Id: Ic94160eb3a4504a369606261440df0e5354ac027 Signed-off-by: maxbr <maxbr@mi.fu-berlin.de>
2017-03-09Remove docs ci job complains issuesJulien3-49/+49
such as: /home/jenkins-ci/opnfv/slave_root/workspace/docs-verify-rtd-master\ /docs/submodules/pharos/docs/labs/orange-lannion-lab/index.rst:201: ERROR: Unexpected indentation. Change-Id: I258ca061758e73ab576e44af5e4e2fed5e3cdb21 Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
2017-03-08Adding LabelsShubhamRathi6-0/+12
Labels serve as anchors/ refs when referenced from other documents This patch adds labels to docs/*/*/index.rst Change-Id: I3dd866f0721b0c97d7c29fce0b275b29d0b2ddc8 Signed-off-by: ShubhamRathi <shubhamiiitbackup@gmail.com>
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>
2017-01-05Add booking communication reference implementationmaxbr12-97/+144
JIRA: PHAROS-265 This adds an implementation of a booking communication agent that listens for booking notifications from the dashboard and updates the pod status in the dashboard. Change-Id: I1ea22390a46182a185df9c5e1771c9312d462092 Signed-off-by: maxbr <maxbr@mi.fu-berlin.de>
2017-01-05Add library for dashboard notification Systemmaxbr15-145/+196
JIRA: PHAROS-265 Change-Id: Ia33235c5160ef6b36b27a6fe1a2eb97a45e72367 Signed-off-by: maxbr <maxbr@mi.fu-berlin.de>
2017-01-05Add library for dashboard APImaxbr7-13/+140
JIRA: PHAROS-265 The DashboardAPI class can be used to query and update dashboard data. Change-Id: I584a3cc500ff1d67011c18af4e73e504126310a2 Signed-off-by: maxbr <maxbr@mi.fu-berlin.de>
2016-10-25Merge "Add pharos-validator tool"Jack Morgan67-0/+10650
2016-10-17Add unit testsmaxbr25-82/+414
JIRA: RELENG-12 This commit increases test statement coverage to 84%. It also fixes the bugs that emerged while testing. Change-Id: I696091f1a07f8b7647872c7cb15f4368a4690619 Signed-off-by: maxbr <maxbr@mi.fu-berlin.de>
2016-10-12Sync dashboard user data with jiramaxbr12-17/+146
JIRA: PHAROS-264 Change-Id: Ic4533af04946ee0493c762ca79aaf46ee0f80e00 Signed-off-by: maxbr <maxbr@mi.fu-berlin.de>
2016-10-12Merge "Add Installer and Scenario fields to bookings"Jose Lausuch12-50/+182