Alexandru Avadanii [Fri, 10 Nov 2017 18:40:32 +0000 (19:40 +0100)]
arm-pod{5,6}: Add comments about unused ifaces
Change-Id: Iddb6a9731e6db8e8f4f7e9bd5ef770202f33930c
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
de37144aae9ec5f91a71cde9d45e58195bbe4398)
ting wu [Mon, 30 Oct 2017 21:47:53 +0000 (22:47 +0100)]
arm-pod6: add new PDF and IDF files
Change-Id: Id3a1b2014e27dfaabc0e049addb80242a4adf8a3
Signed-off-by: ting wu <ting.wu@enea.com>
(cherry picked from commit
a278a7cfd6528f8c111efdc70ac39cf6bd8b6d1c)
Guillermo Herrero [Tue, 26 Sep 2017 09:33:26 +0000 (11:33 +0200)]
[fuel] Updated adapter template
Change-Id: Ibda422d7b4042e9b2e6c54eae66bd76f1cde0a1e
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
(cherry picked from commit
eab331ec734da213fee17643e5a32cbc53a5de15)
Alexandru Avadanii [Fri, 27 Oct 2017 18:53:10 +0000 (20:53 +0200)]
ericsson-pod1: Add MAC addresses for eno1 ifaces
Synced with old DHA from Danube branch.
Change-Id: I696638003f49bdb1a095c92fcd1440cb56c09c59
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
396a2d60671402413231f3fad056834b1166374a)
Alexandru Avadanii [Tue, 3 Oct 2017 02:56:48 +0000 (04:56 +0200)]
ericsson-pod1: Add net_config
Based on old Fuel DEA from stable/danube:
eno1: # new interface index 4
- fuelweb_admin
ens2f0: # new interface index 2
- public
- management
- storage
ens2f1: # new interface index 3
- private
While at it, use '|' as NIC feature separator to align with the PDF
spec.
Change-Id: I2f9404dd811ecc4826e7ce1d0aebded820777dd2
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
d1e3bbc31b896601c6bb5ed0f5f27473b062a1cd)
Alexandru Avadanii [Wed, 25 Oct 2017 13:10:27 +0000 (15:10 +0200)]
ericsson-pod1: add 2 nics for all servers
Change-Id: If0e7fd76850f0610bd9b899a2a4847428a5472b0
Signed-off-by: mting <dianfeng.du@ericsson.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Tue, 24 Oct 2017 12:55:37 +0000 (14:55 +0200)]
ericsson-pod1: Add IDF for Fuel compatibility
Change-Id: Iea4e8eacaaa4b4d5f0c1c7f05d6be816fe02e0cf
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
639947e163f5788dc2e61a382fa9f3785c77cf8c)
Alexandru Avadanii [Wed, 18 Oct 2017 16:46:11 +0000 (18:46 +0200)]
lf-pod2, arm-pod5: Fuel IDF: Add network info
Extend Fuel section of IDF with:
- OS interface names, required by MCP reclass model;
- NIC bus addresses, required for DPDK scenarios;
JIRA: FUEL-275
Change-Id: I3e20517ec79bc4ee75e0d5a8f74628d9b1f421a8
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
c40bf667bc5d0ba51c8d90edbdcca2399b10e013)
Alexandru Avadanii [Wed, 27 Sep 2017 02:11:48 +0000 (04:11 +0200)]
lf-pod4: Align with PDF spec, minor updates
Change-Id: I942bdb9e29997640330007dfd359e79ab8a52a3f
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
7be782a98b571c5a39c02935123967b12a023b51)
Alexandru Avadanii [Thu, 5 Oct 2017 16:16:26 +0000 (16:16 +0000)]
Merge "arm-virtual2: Drop local_env" into stable/euphrates
Alexandru Avadanii [Thu, 5 Oct 2017 02:17:16 +0000 (04:17 +0200)]
arm-virtual2: Drop local_env
Change-Id: I998c49c7f2a2437cb75f7e1223928514b4998f04
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
1c6c80fb9c37f2582f19e7dbc69dcd8aefb5fee5)
Alexandru Avadanii [Tue, 3 Oct 2017 16:38:00 +0000 (18:38 +0200)]
lf-pod2, arm-pod5: Fuel Installer Descriptor File
While at it, quote string variables in ericsson-pod1 IDF.
Now that we can determine bridge names from IDF, drop legacy
"local_env" mechanism for baremetal PODs.
Change-Id: I1db41cde503099352adb72d0969c1dd0f8a92a59
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
14fe92acb1006cdb01ff57a588683b5bb2f15d47)
Alexandru Avadanii [Thu, 28 Sep 2017 03:17:52 +0000 (05:17 +0200)]
ericsson-pod1: Add Fuel installer descriptor file
Change-Id: I654e887a6247f77fec7ee49cf042f0e9fc608816
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
787d597277811cc2abddea46e1af9b6e4dfb3e45)
Alexandru Avadanii [Thu, 28 Sep 2017 18:00:32 +0000 (20:00 +0200)]
arm-pod5: Fix node-5 MAC order
node-5 MAC order was reversed, leading to deploy failures in Armband.
Change-Id: Iae234753f1b2e51bcbc4d898a2ce92525ec67c5f
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
639f8283f3c1063474db10eefb97bcd6ed66aaf5)
Guillermo Herrero [Wed, 27 Sep 2017 16:12:13 +0000 (18:12 +0200)]
arm-pod5 align with latest PDF spec
Change-Id: I1ae0f356b11cb22be7b32ead2877c0a8e19b9093
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
(cherry picked from commit
cc0472553247aabcade20449c0a8731cb8f77ddd)
Alexandru Avadanii [Sat, 23 Sep 2017 23:07:13 +0000 (01:07 +0200)]
lf-pod2: Pod Descriptor File
[Alexandru.Avadanii@enea.com]
- this is almost completely Guillermo's work, I am just submitting it
on his behalf;
JIRA: FUEL-275
Change-Id: I58bda061695f4dec5cfa390ca069353c29b13e73
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
d5f26dfb8c08c0c919fff87c5f5bc96c82ebffef)
Alexandru Avadanii [Thu, 21 Sep 2017 22:44:56 +0000 (00:44 +0200)]
PDF: Run YAML Linter on pod descriptors / output
We have 2 rounds of YAML files:
- PDF (input file(s) for the installer adapter templates);
- parsed PDF (output file(s) after installer adapter template parse);
Run yamllint on all these files, and summarize the output in a tuple
form: (valid YAML output, successful parse, installer templates cnt).
This helps catching various issues:
- formatting issues in installer adapter templates;
- missing values in PDFs (e.g. lf-pod4 IPMI credentials);
etc.
For now, yamllint failures for output files are non-fatal.
Sample output:
| PDF Verify Matrix | YAML Lint | ... | fuel | joid |
| pharos/config/pod1.yaml | OK | ... | 1/1/1 | 1/1/1 |
| intel/pod18.yaml | OK | ... | 1/1/1 | 1/1/1 |
| arm/pod5.yaml | OK | ... | 1/1/1 | 0/1/1 |
| lf/pod4.yaml | OK | ... | 0/1/1 | 0/1/1 |
Change-Id: Id598da89fab0e7e41641649833471194e8d248a9
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
791cb3f2d864c1f8b9473f9ba4348c4435aa813b)
Alexandru Avadanii [Fri, 22 Sep 2017 00:05:08 +0000 (02:05 +0200)]
PDF: Fix yamllint warnings & fold reusable code
- ericsson-pod{1,2}: Fold node, disk params;
- lf-pod4: Jump server uses same disk params;
- zte-pod{2,3}: only minor formatting;
Change-Id: Ib280aca93f9d6ab1768afa369b922c71485cf79c
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
a9aeec02c2c649b01ef9aad20c0c89f723a1f356)
Alexandru Avadanii [Tue, 26 Sep 2017 02:03:32 +0000 (04:03 +0200)]
[fuel] Sync adapter template with Pharos version
Change-Id: I6f3ea5e2103ae75d96834d8317cc3c505d01e45b
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
e9520de1dd8075a53745b8b88c54b96b5a7581eb)
Alexandru Avadanii [Mon, 25 Sep 2017 21:33:41 +0000 (23:33 +0200)]
check-jinja: Suppress PDF output logging
Change-Id: I92bb9302abb74f5a58b6c10144dbe8d24d188938
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
94026d10f5146d93871efb3e65b2e59897edbbfb)
Alexandru Avadanii [Mon, 25 Sep 2017 21:09:24 +0000 (23:09 +0200)]
check-jinja2: Fix unsupported '-e' arg for columns
Change-Id: Id5827b2f260af215731ea819a9ffc6177648f788
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
43f10d006466459d0b1843c80311543db00ae664)
Alexandru Avadanii [Thu, 21 Sep 2017 00:13:55 +0000 (02:13 +0200)]
PDF: Add result summary to check-jinja2
Apart from Pod Descritpro Files for OPNFV PODs, also validate the Pharos
PDF template itself. While at it, fix shellcheck warnings.
Sample output:
| PDF/Installer | apex | compass4nfv | daisy | joid |
| pharos/config/pod1.yaml | 1/1 | 12/12 | 1/1 | 1/1 |
| intel/pod18.yaml | 1/1 | 12/12 | 1/1 | 1/1 |
| orange/pod1.yaml | 0/1 | 4/12 | 0/1 | 0/1 |
| arm/pod5.yaml | 1/1 | 12/12 | 1/1 | 1/1 |
| ericsson/pod1.yaml | 1/1 | 12/12 | 1/1 | 1/1 |
| ericsson/pod2.yaml | 1/1 | 12/12 | 1/1 | 1/1 |
| lf/pod4.yaml | 1/1 | 12/12 | 1/1 | 1/1 |
| zte/pod3.yaml | 1/1 | 12/12 | 1/1 | 1/1 |
| zte/pod1.yaml | 1/1 | 12/12 | 1/1 | 1/1 |
| zte/pod2.yaml | 1/1 | 12/12 | 1/1 | 1/1 |
Change-Id: Iba46a7cc62c80ccb987879ce94ffe5f0bbb23304
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
5555a6edb45683270a8f2935cd9aa845457e9bc7)
Alexandru Avadanii [Sun, 24 Sep 2017 02:12:41 +0000 (04:12 +0200)]
lf-pod4: Add missing IPMI user/pass
Change-Id: Ica0fce731f737ae3ef02e52094b81475d0c66891
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
e1c417fc5c76110321ad503644995f95e56616d4)
Alexandru Avadanii [Fri, 22 Sep 2017 18:33:38 +0000 (20:33 +0200)]
cleanup: fuel: Remove obsolete reap, dea, dha
Old Fuel (up to and including Danube release) relied on a DEA/DHA
pair of configuration files, usually constructed based on information
collected from a manually deployed POD using a "reap" procedure.
Starting with Euphrates, Fuel will use the PDF as input, so DEA/DHA,
as well as reap data are now obsolete.
Some PODs (arm-pod5, lf-pod2) still have a "local_env" configuration
file, which is a leftover from old Fuel, but can only be dropped
after Fuel automatically detects the jumphost bridge names (either by
matching the IP addresses on the jumphost to the networks in PDF, or
by using a static mapping defined in a PDF companion file, e.g. IDF).
Remove all obsolete configuration, including useless directories.
Change-Id: I9eae2067d83347409c17126aadb19e3d6b95d4b6
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
f431509110f5c820a5b458e61d086d2fcc61a83a)
Alexandru Avadanii [Sun, 24 Sep 2017 23:02:12 +0000 (01:02 +0200)]
[fuel] Refresh installer adapter, sync with pharos
Change-Id: Id8e184458fe6dfaec3127195cfb865cd9fdabb9f
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
067568f1a4449fbfd07c608d7504c9ec48a07334)
Alexandru Avadanii [Sat, 23 Sep 2017 22:59:32 +0000 (00:59 +0200)]
[fuel] adapter: align IPs with recent Fuel changes
Change-Id: I44f63fb7f9e4398a16e1d0b897a2491a60bb1727
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
45ff23c696aff6584a29d7cf7398e130b3858405)
Guillermo Herrero [Fri, 22 Sep 2017 10:57:02 +0000 (12:57 +0200)]
[fuel] Added mcp installer adapter template
Change-Id: Ide977ef48a6339631e2e3cb6fdbacc88a639c0aa
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
(cherry picked from commit
839847df12d65d82b562c859a5813e58064fe6a6)
Alexandru Avadanii [Thu, 21 Sep 2017 23:45:31 +0000 (01:45 +0200)]
arm-pod5: Fix yamllint warnings
Change-Id: I302b014241bd1fa71e029fcd5b5905b0b1112fd5
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
1df17a3f01af616e0930f4e225c1662ce5682319)
Alexandru Avadanii [Thu, 21 Sep 2017 23:30:07 +0000 (01:30 +0200)]
arm-pod5: Fix duplicate MAC addresses
Change-Id: I3664d50a1510e2697c570adcf89cff9d1ea7961f
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
213e7c4bf2ee28c483ecc5d795459ee40712ff58)
Alexandru Avadanii [Thu, 21 Sep 2017 22:57:10 +0000 (00:57 +0200)]
arm-pod5: Fix MAC copy-paste typo
Change-Id: I01c54ebdded9d2aaa4142078699a9a65ffe652fd
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
9e66d687d0cf5f4f313428e8261018e5bb11e630)
Alexandru Avadanii [Thu, 21 Sep 2017 19:08:13 +0000 (21:08 +0200)]
labs: PDF: s/pod owner/pod_owner/g
Change-Id: Idc72cc6c0c8f13410adbb3478f811a8ee8563223
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
fe7a758541590ee51b6fbf95534163532568bbca)
Alexandru Avadanii [Thu, 21 Sep 2017 14:36:47 +0000 (14:36 +0000)]
Merge "arm-pod5: updated admin network / jumphost ipmi"
Guillermo Herrero [Thu, 14 Sep 2017 08:55:39 +0000 (10:55 +0200)]
arm-pod5: updated admin network / jumphost ipmi
Change-Id: Id337c53d94ad52266db8f7419a61d7f2f2e8c300
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
Jack Morgan [Tue, 19 Sep 2017 23:33:55 +0000 (23:33 +0000)]
Merge "Use pharos submodule for PDF validation"
Alexandru Avadanii [Tue, 19 Sep 2017 00:05:09 +0000 (02:05 +0200)]
lf-pod4: Fix yamllint warnings
- align comment start, end;
- s/pod owner/pod_owner/ (not a problem, but breaks syntax highlight);
- remove 'os' param from lfpod4-node1;
Change-Id: I6c61b3a45da390f5db14c4d81f6a7d430fbe8128
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Mon, 18 Sep 2017 21:02:55 +0000 (23:02 +0200)]
Use pharos submodule for PDF validation
Depends-on: Ic4bd75e1b2dc339c15cd4943dfc5a1c74c68b094
Change-Id: I9d6807f3d24cee8d9a03955112a8c179d9ea7d14
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Sat, 16 Sep 2017 23:15:28 +0000 (01:15 +0200)]
utils/generate_config.py: Add dpkg_arch filter
PDF populates the canonical arch name, as reported by $(uname -m).
In some cases, we need to pass the architecture read from PDF to
software components that expect it to be represend in DPKG format
(e.g. MaaS, APT on Debian systems use "amd64" instead of "x86_64").
Change-Id: I5fcef0a2c2a5cdc5332b5fab1fd284386bb865d0
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Fri, 15 Sep 2017 14:21:32 +0000 (16:21 +0200)]
utils/generate_config.py: Add ipaddr_index filter
v5 -> v6:
- IP address can be IPv4 or IPv6;
- add fallback to 'str' type for py3-incompatible 'unicode';
- fix pylint complaints (silence unnecessary ones);
Change-Id: Iea1049a7f5379e9bcb4b785fdd810b67f51c94ab
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Sat, 16 Sep 2017 00:49:41 +0000 (02:49 +0200)]
generate_config: Replace print statement with fc
Fix py3 compatibility by using 'print' function instead.
While at it, fix constant names reported by `pylint` as invalid.
Change-Id: I73e3a370560c038a8814db9758b13026dc4c0b42
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alex Yang [Thu, 14 Sep 2017 10:27:35 +0000 (18:27 +0800)]
Support daisy on zte-pod3
Change-Id: I4bdf8a4a083d5731849aef40473eec2198d3a9b2
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
Aric Gardner [Mon, 11 Sep 2017 19:50:51 +0000 (19:50 +0000)]
Merge "correct lf pod4 fixed_ips"
julien zhang [Sun, 10 Sep 2017 14:47:14 +0000 (14:47 +0000)]
Merge "Make daisy template compatible with lf-pod4"
Guillermo Herrero [Mon, 4 Sep 2017 14:32:55 +0000 (16:32 +0200)]
arm-pod5: descriptor file
JIRA: ARMBAND-292
Change-Id: I33443a8496bfe8a24266ffe99f6562cded88436c
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
Alex Yang [Fri, 8 Sep 2017 07:36:27 +0000 (15:36 +0800)]
Make daisy template compatible with lf-pod4
Now the daisy template is not compatible with lf-pod4, see [1].
The meaning of 'interfaces' in this pod is different with other pods.
Make daisy template compatible with it.
[1] https://build.opnfv.org/ci/job/validate-jinja2-templates-master/80/console
Change-Id: I29058f705bab333c48614b7eab8c8b9e83b9e1cb
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
Blaisonneau David [Wed, 6 Sep 2017 07:28:15 +0000 (09:28 +0200)]
correct lf pod4 fixed_ips
Change-Id: I2b413c239698258cd4dfb521441408513670c855
Signed-off-by: Blaisonneau David <david.blaisonneau@orange.com>
Aric Gardner [Mon, 28 Aug 2017 20:27:52 +0000 (20:27 +0000)]
Merge "Proposition to add a network descriptor in the pdf file"
Blaisonneau David [Thu, 24 Aug 2017 14:44:06 +0000 (16:44 +0200)]
Correct typos to avoid failure in jenkins-ci check
Change-Id: I2e8b789cbc10def76a1b7ee673bc1ca6d7f4137f
Signed-off-by: Blaisonneau David <david.blaisonneau@orange.com>
Julien [Thu, 27 Jul 2017 14:39:37 +0000 (16:39 +0200)]
Proposition to add a network descriptor in the pdf file
linked with patch 36297
Add a network descriptor in the file.
The network descriptor contains what is in the wiki
Each network is linked to an interface number, who refer to an interface
on each server.
Each nodes, list only mac addresses that are used, and plugged, in order
Each nodes can specify ip addresses for each interfaces, it is optionnal
depending on installer choice
This solution split network definition and node definition that contains
only physical informations
Updated this patchset to fix typos
we could rename the net_config names to be less openstack specific
But I don't think it hurts and deploying openstack is a major usecase.
Change-Id: I27f4a56db0e50436f5c59e1645b6d2c4c9b8ae5c
Signed-off-by: Blaisonneau David <david.blaisonneau@orange.com>
Signed-off-by: agardner <agardner@linuxfoundation.org>
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
Signed-off-by: Blaisonneau David <david.blaisonneau@orange.com>
Charalampos Kominos [Wed, 23 Aug 2017 10:50:57 +0000 (12:50 +0200)]
arm-{pod5,virtual2}: local_env: drop obsolete variables
Change-Id: I0146d6f28796c5af69d9acad08d446af333296f6
Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
Alexandru Avadanii [Thu, 17 Aug 2017 18:05:04 +0000 (20:05 +0200)]
arm-pods: Remove obsolete pods and config files
- arm-pod1 was dismembered;
- arm-pod2 will be restored later after the jump server is replaced;
- arm-pod3 becomes arm-pod5, remove old Fuel specific config;
Change-Id: Ia1d087a38583e8f3963f4f2aa2e903240e7df099
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Thu, 17 Aug 2017 17:55:36 +0000 (19:55 +0200)]
arm-{pod3,virtual2}: Openstack public net range
While at it, update arm-pod3 local_env with MCP specific config.
Change-Id: I328ac0dab3095b4d47f2d91ebd74a52a20f5b983
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Thu, 17 Aug 2017 15:33:34 +0000 (17:33 +0200)]
fuel: lf-pod2: Add local_env configuration file
This file provides pod-specific enviroment variables that will be
passed down to Fuel's `ci/deploy.sh` script.
Change-Id: I7e3a5ebf9a30a31b7d4bd7d7dc9a13f7c45e2c6d
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alex Yang [Mon, 31 Jul 2017 00:52:31 +0000 (08:52 +0800)]
Get MAC addresses to help daisy to distinguish the discovered hosts
JIRA: DAISY-42
JIRA: DAISY-56
Now the deploy script cannot distinguish the discovered hosts, then
the roles are assigned to hosts randomly. The MAC addresses of hosts
can help daisy to assign roles correctly.
Change-Id: If413ad776706eb4e25db5223917a7518d856ba8e
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
Alexandru Avadanii [Wed, 26 Jul 2017 16:49:31 +0000 (18:49 +0200)]
arm-virtual2: Update DEFAULT_BRIDGE for MCP
Change-Id: I6cd8df7d1866297fe125727166cdad72e0a64d0f
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Mon, 24 Jul 2017 18:16:17 +0000 (20:16 +0200)]
arm-virtual2: export LIBVIRT_DEFAULT_URI
Change-Id: Ic88f9ab032db65fe0f4390b861b618ecb2ee86ba
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Wed, 19 Jul 2017 01:24:31 +0000 (03:24 +0200)]
arm-virtual2: Add local_env with bridge info
While at it, remove obsolete arm-virtual1 local_env configuration,
as well as old Fuel configuration for arm-virtual_kvm.
Change-Id: I17aab716a33c0ceca993b2cfb552a240e691bec7
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Tue, 18 Jul 2017 01:33:41 +0000 (03:33 +0200)]
arm-pod2: IPMI: Use secondary IP for ipmi2snmp
Our ipmi2snmp proxy uses 2 IPs, use the secondary one since the
primary is now unreachable.
Change-Id: I3fda960758f68c6ba8b0f31620f7639e6bfa5e1d
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alex Yang [Fri, 7 Jul 2017 07:11:42 +0000 (15:11 +0800)]
enable HA deployment in zte-pods for daisy
Change-Id: I0e72702540309b70afcd752b6f6442218fbf9d75
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
Zhijiang Hu [Mon, 3 Jul 2017 17:42:31 +0000 (17:42 +0000)]
Merge "Use POD descriptor file in daisy"
Alex Yang [Mon, 26 Jun 2017 11:38:36 +0000 (19:38 +0800)]
Modify zte-pod2 to non-HA temporarily for test with daisy
Now there are some issues in HA function in daisy.
The pod will be set to HA again when these issues fixed.
Change-Id: I79046448641ddd18e72c9c9dd5f65e9535764824
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
Alex Yang [Thu, 22 Jun 2017 08:27:34 +0000 (16:27 +0800)]
Use POD descriptor file in daisy
Change-Id: Ie043eb252e2bfdbf42f1403b218958190a1070a8
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
Catalina Focsa [Tue, 13 Jun 2017 13:38:23 +0000 (15:38 +0200)]
arm-pod2: Fix IPMI2SNMP Remote hosts
Change-Id: I3ebbfabd45710ea568e559684edbca77f281db8b
Signed-off-by: Catalina Focsa <catalina.focsa@enea.com>
SerenaFeng [Mon, 29 May 2017 11:01:41 +0000 (19:01 +0800)]
change zte-virtual1 to be multinode deployment
Change-Id: I6cae2857d6e407f4570e34446833058f5ddff1e4
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
Alex Yang [Sat, 27 May 2017 02:25:11 +0000 (10:25 +0800)]
Update the gateway info in daisy baremetal deploy
1. update gateway
2. add adapter info
3. remove useless disks info
Change-Id: I65f19e691680af11cbde1119776f241785b5593d
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
SerenaFeng [Fri, 26 May 2017 09:40:59 +0000 (17:40 +0800)]
add external_network configuration to zte-pod2
Change-Id: I4e66c18c176faaf93dc80d2bbe829671c3f0cdec
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
Catalina Focsa [Tue, 16 May 2017 15:06:54 +0000 (17:06 +0200)]
arm-pods:1,3; dea: Modify interfaces properties: MTU
arm-pod2: check
8826cffe65acf34822a9ed4665267f4de6dc65ca
arm-pod1, arm-pod3, virtual_kvm:
Modify MTU value from null into 9000 for each
interface belonging to each node.
Values are to be merged into each fuel node dictionary
by key reference.
JIRA: https://jira.opnfv.org/browse/ARMBAND-199
Change-Id: Ieb80e51087d756499e0591d972aa8edd2fbabf1a
Signed-off-by: Catalina Focsa <catalina.focsa@enea.com>
Alex Yang [Thu, 25 May 2017 04:55:20 +0000 (12:55 +0800)]
Update daisy config files according to opnfv/daisy repo
1. enable multi-nodes for zte-virtual2
2. enlarge disk sizes
3. add adapter param
4. add physical network mapping param
Change-Id: I5b51e8d460a2514303b622b19bebdf10b20ff38c
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
agardner [Thu, 4 May 2017 15:36:05 +0000 (11:36 -0400)]
Hello, OPNFV installer projects
Firstly, this patchset looks a bit messy at the onset. relevant
parts are
installers/apex/*.j2
installers/joid/*.j2
installers/compass4nfv/*.j2
and the new verify job that runs check-jinja2.sh
If you look at installers/*/pod_config.yaml.j2 you will see the network
settings for apex joid and compass4nfv installers, the possible to template
hard coded values have been replaced with jinja2 vales, that are populated by
reading one of labs/*/*/config/pod.yaml
eg:
nodes:
- name: pod1-node1
becomes
- name: {{ conf['nodes'][0]['name'] }}
In my last patchset I had ignored data already present in the pod.yaml (which is defined in the pharos spec here: https://gerrit.opnfv.org/gerrit/gitweb?p=pharos.git;a=blob;f=config/pod1.yaml )
I created by own yaml file in an attempt to figure out what all the
installers needed to know to install on any given pod.
this was counter productive.
I have included a script (securedlab/check-jinja2.sh) that will check all
securedlab/installers/*/pod_config.yaml.j2
against all
securedlab/labs/*/pod*.yaml
This is a first step towards having your installers run on any pod that
has a pod file created for it. (securedlab/labs/*/pod[pod-number].yaml)
Moving forward I would like your input on identifing variables in your
installers configs that are needed for deployment but not covered by
securedlab/labs/*/pod*.yaml
Thanks for your time and feedback
Best Regards,
Aric
Change-Id: I5f2f2b403f219a1ec4b35e46a5bc49037a0a89cf
Signed-off-by: agardner <agardner@linuxfoundation.org>
Aric Gardner [Fri, 19 May 2017 15:58:50 +0000 (15:58 +0000)]
Merge "add pod descriptor file for ericsson pod1"
Aric Gardner [Fri, 19 May 2017 15:58:35 +0000 (15:58 +0000)]
Merge "Add pod18.yaml file for Intel lab"
Jack Morgan [Fri, 19 May 2017 14:24:14 +0000 (07:24 -0700)]
Add pod18.yaml file for Intel lab
Change-Id: Iaf6f6e01ffbe2d899e1ff9b84d07e38447ce9357
Signed-off-by: Jack Morgan <jack.morgan@intel.com>
mting [Thu, 18 May 2017 08:51:27 +0000 (10:51 +0200)]
add pod descriptor file for ericsson pod2
Change-Id: Ia0467878d21f6ab88af5ecc47e27b259dfbba0e6
Signed-off-by: mting <dianfeng.du@ericsson.com>
mting [Thu, 18 May 2017 07:36:41 +0000 (09:36 +0200)]
add pod descriptor file for ericsson pod1
Change-Id: I9ba68c0ad5f1f10a714f584f3f974a52558dcaba
Signed-off-by: mting <dianfeng.du@ericsson.com>
Catalina Focsa [Tue, 16 May 2017 10:55:34 +0000 (12:55 +0200)]
arm-pod2: dea: Modify interfaces properties: MTU
Modify MTU value from null into 9000 for each
interface belonging to each node.
Values are to be merged into each fuel node dictionary
by key reference.
JIRA: ARMBAND-199
Change-Id: I77d70c25f1947ecd71585f7a730f749e5066d269
Signed-off-by: Catalina Focsa <catalina.focsa@enea.com>
agardner [Thu, 27 Apr 2017 14:17:23 +0000 (16:17 +0200)]
Add check-jinja and lf pod1 descriptor
Change-Id: Ic580cd934c674e5d0e7ce3cca3a113d8531e3400
Signed-off-by: agardner <agardner@linuxfoundation.org>
agardner [Wed, 26 Apr 2017 11:48:59 +0000 (13:48 +0200)]
Takes a template file and feeds it values
Values come from a pod config file.
This is just an example, only ipmi_ips are templated at this time.
eg: address: {{ config['global_details']['ipmi_ips'][0] }}
test like this:
./utils/generate_config.py -y labs/intel/pod5/pod.yaml -j
installers/joid/labconfig.jinja2
releng should have a new job, validate-templates
that looks for
pattern: 'utils/generate_config.yml'
pattern: '**/*.jinja2'
and tests that templating does not error.
Change-Id: I7f781abb702afcfccf7ed17674378cffe4a7177d
Signed-off-by: agardner <agardner@linuxfoundation.org>
Julien [Sun, 9 Apr 2017 08:40:42 +0000 (16:40 +0800)]
add ceph osd config
add /dev/sdb for ceph osd
Change-Id: Ie3a16957ef988ccde44b668ea56aad0274c9d788
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
Cristina Pauna [Mon, 3 Apr 2017 11:34:32 +0000 (14:34 +0300)]
Correct typo in virtual pod dea
One of the reason virtual deploys have failed is a typo in the
dea file.
Change-Id: If760cdf9790eb2fa4a49b3acf0b2b7e88a3cf3ea
Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
Signed-off-by: Harry Kominos <Charalampos.Kominos@enea.com>
Alexandru Avadanii [Sat, 1 Apr 2017 00:45:23 +0000 (02:45 +0200)]
arm-pod3: Fix IPMI2SNMP port mapping
Change-Id: I2fe5a60eca8b014df5f3a3a7259df6c2b101dead
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Thu, 30 Mar 2017 11:28:34 +0000 (11:28 +0000)]
Merge "arm-pod1: Fix missing uri in repo config"
Alexandru Avadanii [Thu, 30 Mar 2017 11:25:49 +0000 (13:25 +0200)]
arm-pod1: Fix missing uri in repo config
Change-Id: I669de01f7e739650aa2bca8b8842928d6d3a7069
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Wed, 29 Mar 2017 18:33:40 +0000 (20:33 +0200)]
arm-pod3: Use IPMI2SNMP to bypass flaky IPMI
This is specific to Enea Pharos Lab, where we have a proxy that
translates IPMI requests to SNMP which commands a power controller.
Change-Id: I6c62c900823bf1496754fcbbbb8d81c5fa173e9c
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Cristina Pauna [Mon, 27 Mar 2017 14:21:53 +0000 (17:21 +0300)]
Update repos for arm pods
Workarownd for JIRA: FUEL-250
Change-Id: I44077a6c5439e82d4547865e45a7f502778f897d
Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
Julien [Fri, 24 Mar 2017 09:18:00 +0000 (17:18 +0800)]
update according to daisy requirement
Change-Id: Ia5af58aa72d6d3294e4257847cca200c6aa47a0c
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
Alexandru Avadanii [Thu, 23 Mar 2017 02:51:35 +0000 (03:51 +0100)]
arm-pod1: Remove package list override
Let all package selection default to recently added kernel.
Change-Id: I0f67e19d57dee1578a9172f32d72d25094f053f2
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
SerenaFeng [Thu, 16 Mar 2017 03:22:35 +0000 (11:22 +0800)]
change EXTERNAL config for daisy virtual1
Change-Id: I5bd2271374f8ebfe891a01e7566d69851ef97244
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
Julien [Tue, 14 Mar 2017 05:53:06 +0000 (13:53 +0800)]
Update the ip according requirement of daisy
Change-Id: Ic906cf1ab1074b4e2c677cd73e95d13bf4c1754c
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
julien zhang [Fri, 10 Mar 2017 11:17:23 +0000 (11:17 +0000)]
Merge "Add POD3 yaml file"
julien zhang [Fri, 10 Mar 2017 11:17:10 +0000 (11:17 +0000)]
Merge "Update POD2 pod yaml file"
Julien [Thu, 9 Mar 2017 09:15:19 +0000 (17:15 +0800)]
Update POD2 pod yaml file
Change-Id: I1bed6d3cc887696946543fef97396ba5dbaf177f
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
Julien [Tue, 20 Dec 2016 16:46:26 +0000 (00:46 +0800)]
Update ZTE POD1 using ymal file template
update according to the final decision.
Change-Id: Id7e9c52506e54399a079ba13ea29e9490a0a0749
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
Julien [Thu, 9 Mar 2017 12:45:08 +0000 (20:45 +0800)]
Add POD3 yaml file
Change-Id: I2e1dfbfecf48a3b6719697fa60f27e6480a306ed
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
Julien [Tue, 7 Mar 2017 05:48:58 +0000 (13:48 +0800)]
Update gateway and vlan for daisy
Change-Id: I5794c5feabe66783ed2ce1573a5e22ec30ab7d82
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
Michael Polenchuk [Mon, 6 Mar 2017 11:57:18 +0000 (15:57 +0400)]
[e-virtual] Increase allocated memory for vms
Change-Id: Ie7182a64bb904bda34d7ad5d724f407ca2134e20
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Julien [Sun, 26 Feb 2017 14:07:05 +0000 (22:07 +0800)]
Update configuration for daisy
Change-Id: I5f7120e18cf00de09949abdf348614bb807f6207
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
Michael Polenchuk [Wed, 22 Feb 2017 11:02:19 +0000 (15:02 +0400)]
[lf-pod2] Mend dns and ntp servers settings
Change-Id: I55d896b3cdc261681d998d1d305854035b0ccc53
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
julien zhang [Tue, 14 Feb 2017 13:49:35 +0000 (13:49 +0000)]
Merge "Add labs for daisy"
Julien [Mon, 6 Feb 2017 09:28:18 +0000 (17:28 +0800)]
Add labs for daisy
including:
pod2 and virtual1 and vitual2
JIRA: DAISY-40
Change-Id: Ia62ed654c52843410b94bf7042e782653ff2830c
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
wu.zhihui [Thu, 9 Feb 2017 05:59:11 +0000 (13:59 +0800)]
bugfix local mirrors repos
Change-Id: I6f34f7bc66f1dd5e2140d7ce3815440fd24a1ba7
Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>
Alexandru Avadanii [Mon, 6 Feb 2017 21:55:57 +0000 (22:55 +0100)]
arm-pod3: Fix incomplete regex in DEA
Change-Id: Id752c5823b98667a45955359f77630df07fb2e51
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>