securedlab.git
6 years agomodify admin network segment 03/48703/2 master
zhihui wu [Tue, 12 Dec 2017 08:54:28 +0000 (16:54 +0800)]
modify admin network segment

It conflicts with INSTALLER_IP.

Change-Id: I4ec6476c4a7674576fee2510770f0354ad9fd0e1
Signed-off-by: zhihui wu <wu.zhihui1@zte.com.cn>
6 years agogenerate_config.py exists in the pharos repo 33/47733/1
agardner [Thu, 23 Nov 2017 20:54:13 +0000 (15:54 -0500)]
generate_config.py exists in the pharos repo

it should not also be in the secured lab repo
now that we have the option to encrypt strings with
eyaml. the secured lab will be going away.
This is a first step

Change-Id: Ief51fd53919af2e9891bdda7019e8a9101f2b56e
Signed-off-by: agardner <agardner@linuxfoundation.org>
6 years agoUpdate IDF and PDF for zte pods 81/47481/1
Alex Yang [Mon, 20 Nov 2017 06:26:25 +0000 (14:26 +0800)]
Update IDF and PDF for zte pods

1. Add IDF of zte pod2 and pod3
2. Update PDF of zte pod2 and pod3
3. Update pod config template for yaml-lint

Change-Id: I30f644009ab270f929fe3ee41171986a0e0bde63
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
6 years agoMerge "arm-pod{5,6}: Add comments about unused ifaces"
Alexandru Avadanii [Mon, 13 Nov 2017 16:00:33 +0000 (16:00 +0000)]
Merge "arm-pod{5,6}: Add comments about unused ifaces"

6 years agoMerge "rename pdf name for bii lab"
julien zhang [Sat, 11 Nov 2017 15:36:48 +0000 (15:36 +0000)]
Merge "rename pdf name for bii lab"

6 years agoarm-pod{5,6}: Add comments about unused ifaces 57/47057/1
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>
6 years agoMerge "arm-pod6: add new PDF and IDF files"
Alexandru Avadanii [Thu, 2 Nov 2017 16:54:27 +0000 (16:54 +0000)]
Merge "arm-pod6: add new PDF and IDF files"

6 years agoarm-pod6: add new PDF and IDF files 43/46443/4
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>
6 years agosome bugfix in the PDF of zte-pod1 05/46505/1
zhihui wu [Wed, 1 Nov 2017 06:48:18 +0000 (14:48 +0800)]
some bugfix in the PDF of zte-pod1

Change-Id: I5c0f01db5bc984067d737f89e424378b88298610
Signed-off-by: zhihui wu <wu.zhihui1@zte.com.cn>
6 years agoMerge "update PDF and IDF files for zte-pod1"
Serena Feng [Wed, 1 Nov 2017 01:54:28 +0000 (01:54 +0000)]
Merge "update PDF and IDF files for zte-pod1"

6 years agoupdate PDF and IDF files for zte-pod1 53/46453/2
zhihui wu [Tue, 31 Oct 2017 03:31:30 +0000 (11:31 +0800)]
update PDF and IDF files for zte-pod1

For supporting MCP deployment, update the PDF and IDF files
for zte-pod1

Change-Id: I835b5b6fd864f8f6110921ac4b508996b5844216
Signed-off-by: zhihui wu <wu.zhihui1@zte.com.cn>
6 years agoMerge "installer adapters: Remove Fuel template"
Alexandru Avadanii [Mon, 30 Oct 2017 17:25:18 +0000 (17:25 +0000)]
Merge "installer adapters: Remove Fuel template"

6 years agoericsson-pod1: Add MAC addresses for eno1 ifaces 33/46333/1
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>
6 years agoinstaller adapters: Remove Fuel template 17/46317/1
Alexandru Avadanii [Fri, 27 Oct 2017 16:54:49 +0000 (18:54 +0200)]
installer adapters: Remove Fuel template

Since we moved installer adapters to pharos git repo, the Fuel
adapter template in securedlab is both obsolete and out of date.
Remove it to reduce confusion.

Change-Id: I6e501df1ca4e09c1d368e6f0d634d5c802258d07
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
6 years agoMerge "ericsson-pod1: Add net_config"
Alexandru Avadanii [Thu, 26 Oct 2017 14:21:49 +0000 (14:21 +0000)]
Merge "ericsson-pod1: Add net_config"

6 years agoericsson-pod1: Add net_config 13/46213/1
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>
6 years agoericsson-pod1: Add IDF for Fuel compatibility 71/46171/2
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>
6 years agoadd 2 nics for all server 01/46201/1
mting [Wed, 25 Oct 2017 13:10:27 +0000 (15:10 +0200)]
add 2 nics for all server

Change-Id: If0e7fd76850f0610bd9b899a2a4847428a5472b0
Signed-off-by: mting <dianfeng.du@ericsson.com>
6 years agolf-pod2, arm-pod5: Fuel IDF: Add network info 87/45587/2
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>
6 years agorename pdf name for bii lab 53/45353/1
Julien [Tue, 17 Oct 2017 14:31:27 +0000 (22:31 +0800)]
rename pdf name for bii lab

The standard name is:
lab/(lab_name)/pod#.yaml

Change-Id: Ib353c59bb499d17a02d708427e54dd40dda31d1a
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
6 years agoAdd BII POD1 descriptor file 'bii_pod1.ymal' 63/41263/4
louie.long [Thu, 7 Sep 2017 03:11:23 +0000 (11:11 +0800)]
Add BII POD1 descriptor file 'bii_pod1.ymal'

According to the relevant requirements commit BII Pharos lab's PDF
to the securedlab repo for Euphrates release and pharos dashboard.

1.modify PDF file name to "bii_pod1.yaml"
2.modify Lab's name
3.add net_config describe
4.modify node interface describe
5.add remote hardware manage IP and login account

Change-Id: I314332269f86e16bc273b6ec80568dfaf88bcd1e
Signed-off-by: louie.long <longyu805@163.com>
6 years agoarm-virtual2: Drop local_env 01/44301/1
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>
6 years agoMerge "lf-pod2, arm-pod5: Fuel Installer Descriptor File"
Alexandru Avadanii [Wed, 4 Oct 2017 23:01:29 +0000 (23:01 +0000)]
Merge "lf-pod2, arm-pod5: Fuel Installer Descriptor File"

6 years agoMerge "lf-pod4: Align with PDF spec, minor updates"
Aric Gardner [Tue, 3 Oct 2017 20:17:03 +0000 (20:17 +0000)]
Merge "lf-pod4: Align with PDF spec, minor updates"

6 years agolf-pod4: Align with PDF spec, minor updates 41/43241/2
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>
6 years agolf-pod2, arm-pod5: Fuel Installer Descriptor File 27/44127/1
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>
6 years agoMerge "ericsson-pod1: Add Fuel installer descriptor file"
Alexandru Avadanii [Mon, 2 Oct 2017 20:45:39 +0000 (20:45 +0000)]
Merge "ericsson-pod1: Add Fuel installer descriptor file"

6 years agoarm-pod5: Fix node-5 MAC order 99/43499/1
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>
6 years agoericsson-pod1: Add Fuel installer descriptor file 81/43381/1
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>
6 years agoMerge "arm-pod5 align with latest PDF spec"
Alexandru Avadanii [Wed, 27 Sep 2017 16:47:45 +0000 (16:47 +0000)]
Merge "arm-pod5 align with latest PDF spec"

6 years agoarm-pod5 align with latest PDF spec 25/43325/3
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>
6 years agolf-pod2: Pod Descriptor File 75/42875/4
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>
6 years agoPDF: Run YAML Linter on pod descriptors / output 11/42711/5
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>
6 years agoMerge "PDF: Fix yamllint warnings & fold reusable code"
Alexandru Avadanii [Tue, 26 Sep 2017 14:39:34 +0000 (14:39 +0000)]
Merge "PDF: Fix yamllint warnings & fold reusable code"

6 years ago[fuel] Updated adapter template 55/43155/1
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>
6 years ago[fuel] Sync adapter template with Pharos version 93/43093/1
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>
6 years agocheck-jinja: Suppress PDF output logging 65/43065/2
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>
6 years agocheck-jinja2: Fix unsupported '-e' arg for columns 59/43059/1
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>
6 years agoMerge "PDF: Add result summary to check-jinja2"
Aric Gardner [Mon, 25 Sep 2017 20:41:25 +0000 (20:41 +0000)]
Merge "PDF: Add result summary to check-jinja2"

6 years agoPDF: Fix yamllint warnings & fold reusable code 29/42729/3
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>
6 years agoMerge "lf-pod4: Add missing IPMI user/pass"
Aric Gardner [Mon, 25 Sep 2017 19:30:26 +0000 (19:30 +0000)]
Merge "lf-pod4: Add missing IPMI user/pass"

6 years agocleanup: fuel: Remove obsolete reap, dea, dha 05/42805/2
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>
6 years agolf-pod4: Add missing IPMI user/pass 81/42881/2
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>
6 years ago[fuel] Refresh installer adapter, sync with pharos 95/42895/1
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>
6 years agoPDF: Add result summary to check-jinja2 99/42599/3
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>
6 years ago[fuel] adapter: align IPs with recent Fuel changes 71/42871/1
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>
6 years ago[fuel] Added mcp installer adapter template 53/42753/2
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>
6 years agoarm-pod5: Fix yamllint warnings 27/42727/1
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>
6 years agoarm-pod5: Fix duplicate MAC addresses 21/42721/1
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>
6 years agoarm-pod5: Fix MAC copy-paste typo 15/42715/1
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>
6 years agolabs: PDF: s/pod owner/pod_owner/g 91/42691/1
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>
6 years agoMerge "arm-pod5: updated admin network / jumphost ipmi"
Alexandru Avadanii [Thu, 21 Sep 2017 14:36:47 +0000 (14:36 +0000)]
Merge "arm-pod5: updated admin network / jumphost ipmi"

6 years agoarm-pod5: updated admin network / jumphost ipmi 37/41937/6
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>
6 years agoMerge "Use pharos submodule for PDF validation"
Jack Morgan [Tue, 19 Sep 2017 23:33:55 +0000 (23:33 +0000)]
Merge "Use pharos submodule for PDF validation"

6 years agolf-pod4: Fix yamllint warnings 45/42345/1
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>
6 years agoUse pharos submodule for PDF validation 41/42341/1
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>
6 years agoutils/generate_config.py: Add dpkg_arch filter 45/42145/1
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>
6 years agoutils/generate_config.py: Add ipaddr_index filter 75/42075/2
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>
6 years agogenerate_config: Replace print statement with fc 09/42109/2
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>
6 years agoSupport daisy on zte-pod3 53/41953/1
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>
6 years agoMerge "correct lf pod4 fixed_ips"
Aric Gardner [Mon, 11 Sep 2017 19:50:51 +0000 (19:50 +0000)]
Merge "correct lf pod4 fixed_ips"

6 years agoMerge "Make daisy template compatible with lf-pod4"
julien zhang [Sun, 10 Sep 2017 14:47:14 +0000 (14:47 +0000)]
Merge "Make daisy template compatible with lf-pod4"

6 years agoarm-pod5: descriptor file 05/41005/5
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>
6 years agoMake daisy template compatible with lf-pod4 75/41375/1
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>
6 years agocorrect lf pod4 fixed_ips 57/41157/1
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>
6 years agoMerge "Proposition to add a network descriptor in the pdf file"
Aric Gardner [Mon, 28 Aug 2017 20:27:52 +0000 (20:27 +0000)]
Merge "Proposition to add a network descriptor in the pdf file"

6 years agoCorrect typos to avoid failure in jenkins-ci check 07/40107/1
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>
6 years agoProposition to add a network descriptor in the pdf file 83/38283/8
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>
6 years agoarm-{pod5,virtual2}: local_env: drop obsolete variables 81/39981/6
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>
6 years agoarm-pods: Remove obsolete pods and config files 37/39537/1
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>
6 years agoarm-{pod3,virtual2}: Openstack public net range 33/39533/1
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>
6 years agofuel: lf-pod2: Add local_env configuration file 21/39521/1
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>
6 years agoGet MAC addresses to help daisy to distinguish the discovered hosts 87/38387/1
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>
6 years agoarm-virtual2: Update DEFAULT_BRIDGE for MCP 09/38209/1
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>
6 years agoarm-virtual2: export LIBVIRT_DEFAULT_URI 09/38009/1
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>
6 years agoarm-virtual2: Add local_env with bridge info 07/37707/2
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>
6 years agoarm-pod2: IPMI: Use secondary IP for ipmi2snmp 67/37667/1
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>
6 years agoenable HA deployment in zte-pods for daisy 57/37057/1
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>
6 years agoMerge "Use POD descriptor file in daisy"
Zhijiang Hu [Mon, 3 Jul 2017 17:42:31 +0000 (17:42 +0000)]
Merge "Use POD descriptor file in daisy"

6 years agoModify zte-pod2 to non-HA temporarily for test with daisy 09/36509/1
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>
6 years agoUse POD descriptor file in daisy 63/36363/1
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>
6 years agoarm-pod2: Fix IPMI2SNMP Remote hosts 47/36047/1
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>
6 years agochange zte-virtual1 to be multinode deployment 77/35477/1
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>
6 years agoUpdate the gateway info in daisy baremetal deploy 29/35429/1
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>
6 years agoadd external_network configuration to zte-pod2 03/35403/1
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>
6 years agoarm-pods:1,3; dea: Modify interfaces properties: MTU 51/34851/3
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>
6 years agoUpdate daisy config files according to opnfv/daisy repo 05/35305/1
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>
6 years agoHello, OPNFV installer projects 81/34281/11
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>
6 years agoMerge "add pod descriptor file for ericsson pod1"
Aric Gardner [Fri, 19 May 2017 15:58:50 +0000 (15:58 +0000)]
Merge "add pod descriptor file for ericsson pod1"

6 years agoMerge "Add pod18.yaml file for Intel lab"
Aric Gardner [Fri, 19 May 2017 15:58:35 +0000 (15:58 +0000)]
Merge "Add pod18.yaml file for Intel lab"

6 years agoAdd pod18.yaml file for Intel lab 61/35061/1
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>
6 years agoadd pod descriptor file for ericsson pod2 65/34965/5
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>
6 years agoadd pod descriptor file for ericsson pod1 45/34945/7
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>
7 years agoarm-pod2: dea: Modify interfaces properties: MTU 39/34839/2
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>
7 years agoAdd check-jinja and lf pod1 descriptor 59/33959/2
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>
7 years agoTakes a template file and feeds it values 49/33849/3
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>
7 years agoadd ceph osd config 61/33161/1
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>
7 years agoCorrect typo in virtual pod dea 07/32907/2
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>
7 years agoarm-pod3: Fix IPMI2SNMP port mapping 33/32833/1
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>
7 years agoMerge "arm-pod1: Fix missing uri in repo config"
Alexandru Avadanii [Thu, 30 Mar 2017 11:28:34 +0000 (11:28 +0000)]
Merge "arm-pod1: Fix missing uri in repo config"