aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-09-24[fuel] Refresh installer adapter, sync with pharosAlexandru Avadanii1-89/+58
Change-Id: Id8e184458fe6dfaec3127195cfb865cd9fdabb9f Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 067568f1a4449fbfd07c608d7504c9ec48a07334)
2017-09-23[fuel] adapter: align IPs with recent Fuel changesAlexandru Avadanii1-7/+6
Change-Id: I44f63fb7f9e4398a16e1d0b897a2491a60bb1727 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 45ff23c696aff6584a29d7cf7398e130b3858405)
2017-09-22[fuel] Added mcp installer adapter templateGuillermo Herrero1-0/+97
Change-Id: Ide977ef48a6339631e2e3cb6fdbacc88a639c0aa Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com> (cherry picked from commit 839847df12d65d82b562c859a5813e58064fe6a6)
2017-09-22arm-pod5: Fix yamllint warningsAlexandru Avadanii1-21/+21
Change-Id: I302b014241bd1fa71e029fcd5b5905b0b1112fd5 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 1df17a3f01af616e0930f4e225c1662ce5682319)
2017-09-22arm-pod5: Fix duplicate MAC addressesAlexandru Avadanii1-2/+2
Change-Id: I3664d50a1510e2697c570adcf89cff9d1ea7961f Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 213e7c4bf2ee28c483ecc5d795459ee40712ff58)
2017-09-22arm-pod5: Fix MAC copy-paste typoAlexandru Avadanii1-1/+1
Change-Id: I01c54ebdded9d2aaa4142078699a9a65ffe652fd Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 9e66d687d0cf5f4f313428e8261018e5bb11e630)
2017-09-22labs: PDF: s/pod owner/pod_owner/gAlexandru Avadanii6-6/+6
Change-Id: Idc72cc6c0c8f13410adbb3478f811a8ee8563223 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit fe7a758541590ee51b6fbf95534163532568bbca)
2017-09-21Merge "arm-pod5: updated admin network / jumphost ipmi"Alexandru Avadanii1-11/+11
2017-09-21arm-pod5: updated admin network / jumphost ipmiGuillermo Herrero1-11/+11
Change-Id: Id337c53d94ad52266db8f7419a61d7f2f2e8c300 Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
2017-09-19Merge "Use pharos submodule for PDF validation"Jack Morgan3-4/+9
2017-09-19lf-pod4: Fix yamllint warningsAlexandru Avadanii1-9/+8
- 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>
2017-09-18Use pharos submodule for PDF validationAlexandru Avadanii3-4/+9
Depends-on: Ic4bd75e1b2dc339c15cd4943dfc5a1c74c68b094 Change-Id: I9d6807f3d24cee8d9a03955112a8c179d9ea7d14 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-09-17utils/generate_config.py: Add dpkg_arch filterAlexandru Avadanii1-0/+17
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>
2017-09-16utils/generate_config.py: Add ipaddr_index filterAlexandru Avadanii1-0/+13
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>
2017-09-16generate_config: Replace print statement with fcAlexandru Avadanii1-9/+9
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>
2017-09-14Support daisy on zte-pod3Alex Yang4-1/+213
Change-Id: I4bdf8a4a083d5731849aef40473eec2198d3a9b2 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-09-11Merge "correct lf pod4 fixed_ips"Aric Gardner1-9/+9
2017-09-10Merge "Make daisy template compatible with lf-pod4"julien zhang1-0/+4
2017-09-08arm-pod5: descriptor fileGuillermo Herrero1-0/+183
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>
2017-09-08Make daisy template compatible with lf-pod4Alex Yang1-0/+4
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>
2017-09-06correct lf pod4 fixed_ipsBlaisonneau David1-9/+9
Change-Id: I2b413c239698258cd4dfb521441408513670c855 Signed-off-by: Blaisonneau David <david.blaisonneau@orange.com>
2017-08-28Merge "Proposition to add a network descriptor in the pdf file"Aric Gardner1-0/+168
2017-08-24Correct typos to avoid failure in jenkins-ci checkBlaisonneau David17-211/+211
Change-Id: I2e8b789cbc10def76a1b7ee673bc1ca6d7f4137f Signed-off-by: Blaisonneau David <david.blaisonneau@orange.com>
2017-08-24Proposition to add a network descriptor in the pdf fileJulien1-0/+168
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>
2017-08-23arm-{pod5,virtual2}: local_env: drop obsolete variablesCharalampos Kominos2-2/+0
Change-Id: I0146d6f28796c5af69d9acad08d446af333296f6 Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
2017-08-17arm-pods: Remove obsolete pods and config filesAlexandru Avadanii9-1317/+0
- 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>
2017-08-17arm-{pod3,virtual2}: Openstack public net rangeAlexandru Avadanii2-3/+4
While at it, update arm-pod3 local_env with MCP specific config. Change-Id: I328ac0dab3095b4d47f2d91ebd74a52a20f5b983 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-17fuel: lf-pod2: Add local_env configuration fileAlexandru Avadanii1-0/+1
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>
2017-07-31Get MAC addresses to help daisy to distinguish the discovered hostsAlex Yang1-0/+10
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>
2017-07-26arm-virtual2: Update DEFAULT_BRIDGE for MCPAlexandru Avadanii1-1/+1
Change-Id: I6cd8df7d1866297fe125727166cdad72e0a64d0f Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-07-24arm-virtual2: export LIBVIRT_DEFAULT_URIAlexandru Avadanii1-0/+1
Change-Id: Ic88f9ab032db65fe0f4390b861b618ecb2ee86ba Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-07-19arm-virtual2: Add local_env with bridge infoAlexandru Avadanii4-447/+1
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>
2017-07-18arm-pod2: IPMI: Use secondary IP for ipmi2snmpAlexandru Avadanii1-5/+5
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>
2017-07-07enable HA deployment in zte-pods for daisyAlex Yang6-51/+64
Change-Id: I0e72702540309b70afcd752b6f6442218fbf9d75 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-07-03Merge "Use POD descriptor file in daisy"Zhijiang Hu1-0/+37
2017-06-26Modify zte-pod2 to non-HA temporarily for test with daisyAlex Yang1-6/+6
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>
2017-06-22Use POD descriptor file in daisyAlex Yang1-0/+37
Change-Id: Ie043eb252e2bfdbf42f1403b218958190a1070a8 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-06-13arm-pod2: Fix IPMI2SNMP Remote hostsCatalina Focsa1-5/+5
Change-Id: I3ebbfabd45710ea568e559684edbca77f281db8b Signed-off-by: Catalina Focsa <catalina.focsa@enea.com>
2017-05-29change zte-virtual1 to be multinode deploymentSerenaFeng1-14/+31
Change-Id: I6cae2857d6e407f4570e34446833058f5ddff1e4 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2017-05-27Update the gateway info in daisy baremetal deployAlex Yang2-4/+3
1. update gateway 2. add adapter info 3. remove useless disks info Change-Id: I65f19e691680af11cbde1119776f241785b5593d Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-05-26add external_network configuration to zte-pod2SerenaFeng1-0/+2
Change-Id: I4e66c18c176faaf93dc80d2bbe829671c3f0cdec Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2017-05-25arm-pods:1,3; dea: Modify interfaces properties: MTUCatalina Focsa3-0/+32
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>
2017-05-25Update daisy config files according to opnfv/daisy repoAlex Yang4-42/+57
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>
2017-05-19Hello, OPNFV installer projectsagardner25-672/+1358
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>
2017-05-19Merge "add pod descriptor file for ericsson pod1"Aric Gardner1-0/+275
2017-05-19Merge "Add pod18.yaml file for Intel lab"Aric Gardner2-0/+294
2017-05-19Add pod18.yaml file for Intel labJack Morgan2-0/+294
Change-Id: Iaf6f6e01ffbe2d899e1ff9b84d07e38447ce9357 Signed-off-by: Jack Morgan <jack.morgan@intel.com>
2017-05-19add pod descriptor file for ericsson pod2mting1-0/+275
Change-Id: Ia0467878d21f6ab88af5ecc47e27b259dfbba0e6 Signed-off-by: mting <dianfeng.du@ericsson.com>
2017-05-19add pod descriptor file for ericsson pod1mting1-0/+275
Change-Id: I9ba68c0ad5f1f10a714f584f3f974a52558dcaba Signed-off-by: mting <dianfeng.du@ericsson.com>
2017-05-16arm-pod2: dea: Modify interfaces properties: MTUCatalina Focsa1-0/+16
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>