summaryrefslogtreecommitdiffstats
path: root/deploy
AgeCommit message (Collapse)AuthorFilesLines
2016-10-07Support different format of fuel task infoMichal Skalski1-2/+7
As described in this bug: https://bugs.launchpad.net/fuel/+bug/1625518 json output of the task can be in different format: single dict or list of dicts. During tests of https://gerrit.opnfv.org/gerrit/21807 only the later one was visible, try to support both types of output. Change-Id: I7d3e12270c8246b03bdc6c73d3be77a039df469f Signed-off-by: Michal Skalski <mskalski@mirantis.com> (cherry picked from commit b2a63bfe5746729b4731a14d98c50fb7f59d875e)
2016-10-04Change the way how we track deploymentMichal Skalski1-35/+76
Use fuel2 for start deployment. Since it does not return progress use deployment task to provide this information. Currently used 'deploy-changes' will behave the same: https://bugs.launchpad.net/fuel/+bug/1565026 Try to handle situation when nodes temporary go offline. With deploy-changes environment still was in 'new' state in this situtation which causes timeouts from jenkins. JIRA: FUEL-196 Change-Id: I6548a5ec807551388e845044c282b7af32eb9100 Signed-off-by: Michal Skalski <mskalski@mirantis.com> (cherry picked from commit b73526033c5c5b93ca96f411a1d90dc5c49b9228)
2016-09-28deploy: fix: remove storage files during cleanupStefan Sicleru1-3/+1
Remove old disks through virsh instead of calling os.delete() methods so that the cleanup phase would succeed within a non-root setup. [1] Related-bug: ARMBAND-128 [1] https://gerrit.opnfv.org/gerrit/#/c/19491/ Change-Id: I90007edf014c7e15a68b9a334fcaffaa127ee4ab Signed-off-by: Stefan Sicleru <stefan.sicleru@enea.com> (cherry picked from commit d4f9612475a07773af182f244bcd597d25bf4cd8)
2016-09-26Merge "Enable ci off-line deployment" into stable/coloradoJonas Bjurel1-21/+3
2016-09-26Merge "Properly handle quotes in argument masking" into stable/coloradoJonas Bjurel1-1/+2
2016-09-26Merge "Don't fork a templater process, use the library" into stable/coloradoJonas Bjurel1-4/+5
2016-09-20Enable ci off-line deploymentJonas Bjurel1-21/+3
Updated dea_base to use locak repo mirrors for off-line deployment NOT TO BE PART OF COLORADO.1 Change-Id: Ia8e2d716570267ed9a9e06e253b6a7b258ee26eb Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com> (cherry picked from commit caee61817eb7f4235ca33a9da12f14a285f9e012)
2016-09-20Remove extra empty linePeter Barabas1-1/+0
Change-Id: I462a99b42d05b979c4f1904e7309e87ddd94d1bb Signed-off-by: Peter Barabas <peter.barabas@ericsson.com> (cherry picked from commit 2c7b9bb6623844eeea95373ec2752b0200cd69e8)
2016-09-20Don't fork a templater process, use the libraryPeter Barabas1-4/+5
Change-Id: I931ba56fe65f2f5d5af483a8bfe654a0ecda1611 Signed-off-by: Peter Barabas <peter.barabas@ericsson.com> (cherry picked from commit ff26503f13676b7551afc0633621786edd2811f0)
2016-09-20Properly handle quotes in argument maskingPeter Barabas1-1/+2
Use shlex to parse the command line, thus handling quotes and other special characters. Change-Id: Icc3a2cd934aac8f67e07d967f76c7679bcb34996 Signed-off-by: Peter Barabas <peter.barabas@ericsson.com> (cherry picked from commit bddbf2a740b46d1ad763967b8c8662b1877a4d75)
2016-09-19Repo tidy-up + licence scrubingJonas Bjurel7-0/+60
- Added licences and (c) to files not complying to Licence and (c) policies. - Removed example templates not having correct licence claims and no longer being rellevant. - Removed the Vagrant deployment method as it is not used, not rebased/up to date and not holding correct license claims. Strategies used: - Machine generated are not assigned an licence text, the licence follow from the source. - Generated patch files are not assigned an licence text, the licence follow from the source. Change-Id: I9763f076eae51fbb2d4e5cb8cacfa4bb6cf338cc Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com> (cherry picked from commit 65b7cfcd862a75be72fb98777190c49f8b6ea0d3)
2016-09-17Merge "Increase number of hugepages allocated for nova" into stable/coloradoMichal Skalski2-2/+2
2016-09-17Stop using network transformationMichal Skalski27-271/+148
Due the bug in code we did not apply network transformation to created environments, but still Fuel base on chosen segmentation type and networks to NICs assigment has been generated network schema itself. Since we don't use custom network schema we can remove transformation defintions from dea pod overrides files. However there is a need to configure NIC properties in case of dpdk deployment. JIRA: FUEL-192 Change-Id: Ib7dab4d61910ac8c44b6d91e0c486c9693034823 Signed-off-by: Michal Skalski <mskalski@mirantis.com> Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2016-09-16Increase number of hugepages allocated for novaMichal Skalski2-2/+2
Yardstick is using m1.small flavor for some tests, in case of ovs scenario it should be possible to allocate 2GB from hugepages. Change-Id: Ie908d94e63a5055907bb33c69a5e028739f44f2e Signed-off-by: Michal Skalski <mskalski@mirantis.com> (cherry picked from commit c64a4063f591c0140509e3edb88d9f0c3cd20928)
2016-09-13Merge "Add intel-sc lab devel-pipeline configuration" into stable/coloradoJonas Bjurel2-0/+365
2016-09-13update node_reset() in zte_adapter.pywu.zhihui1-23/+5
Change-Id: I71790b8abb25936045f777a78ed903f3b8ce4303 Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn> (cherry picked from commit 161dd445f06aa9a5dfcd273d89a00d1f02260ba3)
2016-09-13Add intel-sc lab devel-pipeline configurationdavidjchou2-0/+365
intel-sc is the lab devel-pipeline configuration for a lab of Intel in Santa Clara, CA, USA. This lab is behind Intel proxy sever. Change-Id: I401b030adf82d6a19397e92aef4b30ebe971d80c Signed-off-by: davidjchou <david.j.chou@intel.com> (cherry picked from commit 8079d1237ab9f2326adef163dc509c8a84e62775)
2016-09-01Merge "transplant: Generate extra interfaces config file" into stable/coloradoJonas Bjurel1-0/+37
2016-09-01deploy/reap.py: Dump extra interfaces information.Alexandru Avadanii1-0/+36
Since on AArch64, Ubuntu local mirror lacks arm64 packages (see [1]), Fuel master requires internet connectivity during deploy, and hence a way to setup such a public (extra) interface automatically. Previous commit "transplant: Generate extra interfaces config file" introduced support for passing this information via DEA (override), which may define a IFCGF_<interface> section in its 'fuel:' section, containing the necessary keys to produce a ifcfg-<interface> file, like in this example: fuel: IFCFG_ETH1: device: eth1 ipaddress: 10.0.1.10 netmask: 255.255.255.0 gateway: 10.0.1.254 In order for Network Manager to use the newly added interfaces for outgoing traffic and honor their GATEWAY setting (e.g. if we just added one public interface), the default route on admin iface (most of the time called eth0) is disabled when extra interfaces are present. FIXME: Only supports lowercase interface names, but so does Fuel, see related bug report [2]. [1] https://jira.opnfv.org/browse/ARMBAND-35 [2] https://jira.opnfv.org/browse/FUEL-136 Change-Id: I14b023b2b9b4c7d9b9f390d4f86f693c176efde0 Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com> Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 888c45b1ab7f70f226e3dc2c81725f1c6397afff)
2016-09-01transplant: Generate extra interfaces config fileAlexandru Avadanii1-0/+37
Original work by Josep, only signed by Alex for upstreaming. The DEA override may contain a IFCGF_<interface> section in its 'fuel:' section, containing the necessary keys to produce a ifcfg-<interface> file, like in this example: fuel: IFCFG_ETH1: device: eth1 ipaddress: 10.0.1.10 netmask: 255.255.255.0 gateway: 10.0.1.254 FIXME: In order for Network Manager to use the newly added interfaces for outgoing traffic and honor their GATEWAY setting (e.g. if we just added one public interface), the default route on admin iface (most of the time called eth0) should be disabled. For now, we assume the admin interface is always "eth0". Change-Id: I96e3ac5046dd59ed10c43099dd76a6418806a1f3 Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com> Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 56d816920bfefe7d41d9c35cb8fb52e36295ee07)
2016-08-30deploy: Delete old Fuel env if presentAlexandru Avadanii1-0/+15
In order to clean up old partitioning and boot entries on target nodes, before removing the Fuel Master, try ssh-ing into it and removing all environments/nodes. This is especially important for EFI systems, where old boot entries are left behind without a proper env delete, leading to target nodes failing to PXE boot on Fuel Master re-install. This change assumes that: - all Fuel Master information is unchanged between old and new deploy (fuel IP, password etc.); - Fuel Master is up and running, in a sane state (target nodes are also online), when deploy starts; Closes: ARMBAND-51 Change-Id: I7b61124ea9182ce2d599adcdedef03e0d8d67ed6 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit f1e808677a29a157e009f33a1a5a024eaad2c021)
2016-08-23Fix ovs scenario configurationMichal Skalski2-4/+4
Due the incorrect indentation install_dpdk option was not set to true. JIRA: OVSNFV-37 Change-Id: Ida3b0d1e72ce8322905ff399af89b43cac878299 Signed-off-by: Michal Skalski <mskalski@mirantis.com> (cherry picked from commit ae8196be2c5863a5ca837828eead7188d608023d)
2016-08-18Tune up virtual envsMichael Polenchuk2-1/+36
* increase the memory/cpu of controller for noha case * reduce the memory of computes Change-Id: Iea9351bb846823fae64a662e92f894eca2f6cecb Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2016-08-17Add config information as well to default labNikolas Hermanns2-1/+46
It is possible that some one changes the config of the vms from a virtual environment. This is already shown in the elx lab. To make everyone aware of this we push it to the default lab as well. Change-Id: I4e9012b3237838b98321472bb16037aa0aeacfdc Signed-off-by: Nikolas Hermanns <nikolas.hermanns@ericsson.com>
2016-08-17deploy: Allow DEA to override bootstrap configAlexandru Avadanii2-3/+20
This commit does not change the current behavior in OPNFV, the preconfigured fuel_bootstrap_cli.yaml from OPNFV ISO is still used to replace the default settings / fuel-menu bootstrap cfg. The only addition is the possibility to override the preconfigured fuel_bootstrap_cli.yaml info using DEA. JIRA: FUEL-155 Change-Id: I4e66b789fdf0a5b1af512a3efc84fedb72ce3b05 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-08-17deploy-config: honor interfaces and transformationsJosep Puigdemont1-0/+23
Currently all scenarios assume interfaces and transformations are the same for all nodes in the POD, however some PODs may contain nodes that have different hardware, or where the interfaces are configured differently. In this patch we honor the original interfaces and transformations if they are present in the dea-override.yaml file. The way to add this information in the dea-override is by having a "nodes:" section with this information, ie: nodes: - id: 1 interfaces: interfaces_1 transformations: transformations_1 - id: 2 interfaces: interfaces_2 transformations: transformations_2 - id: 3 interfaces: interfaces_1 transformations: transformations_1 The node IDs is used to find out this information. Change-Id: If6ff8ca28b42e043d1bdf91142a4a56ae36e4304 Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
2016-08-17Merge "Use virtio driver for fuel-master NIC"Michal Skalski1-1/+1
2016-08-17Change log file permissionsPeter Barabas1-1/+1
Don't make it executable; don't make it world-writable. Change-Id: I5d117b39e70fff2c1cb5e62d017efe0387b9b5f4 Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-08-17Use virtio driver for fuel-master NICMichal Skalski1-1/+1
Using e1000 driver on fuel master may lead to temporarily loss of communication [1]. We can use two approaches here: * use virtio driver * install e1000-kmod package virtio driver should be sufficient for our purposes, we don't use bonding on fuel master. e1000-kmod package is available on fuel master and provide e1000 kernel module which does not introduce additional problems. This package is not installed by default but for this purpose MASTER_NODE_EXTRA_PACKAGES cmdline option can be set during fuel master installation. [1] http://docs.openstack.org/developer/fuel-docs/userdocs/release-notes/fuel_known_issues.html Change-Id: I3fc1fed5f0b9c780cd9174205a3c31dae92a180e Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-08-12Merge "Filter out non-cluster nodes"Michal Skalski1-2/+2
2016-08-12Allign odl-sfc scenarios with new plugin versionMichal Skalski3-105/+23
ODL Boron use different set of sfc features. JIRA: FUEL-169 Change-Id: I38c1e518ffbf625a68f879779c01e4abfdb1d672 Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-08-12Filter out non-cluster nodesMichael Polenchuk1-2/+2
In order to avoid fetching up non-cluster nodes filter them out by option of id. JIRA: FUEL-183 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> Change-Id: If0d0a1480d648167f1bcf726f0d6d345d2e00711
2016-08-12Merge "KVM scenario updates"Michal Skalski1-7/+5
2016-08-12KVM scenario updatesJulien1-7/+5
1. Install CEPH_OSD on 2 compute nodes 2. Delete default 'net_segment_type: tun' definition, for it is already defined in dea_base.yaml, and it can be updated by lab dea files 3. Update osd_pool_size from 1 to 2 4. Michal indicates that https://review.openstack.org/#/c/342717/ set the limitation : Restrict usage of controller and osd role on single host Change-Id: I4907482391588fc21ecf60603b1c599413cbc531 Signed-off-by: Julien-zte <zhang.jun3g@zte.com.cn>
2016-08-11Merge "Fix merge_dicts logic for the case of two nonempty lists"Michal Skalski1-9/+11
2016-08-11Pass host cpu flags to compute guestsMichal Skalski1-0/+3
Both kvm and ovs plugins require specific cpu flags. Host-model mode will pass most of the host cpu flags to guest. If a hypervisor is not able to use the exact CPU model, libvirt automatically falls back to a closest model. JIRA: FUEL-157 Change-Id: I77ce625e118b6de51cbcdb58e4be5a6dcaecf384 Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-08-10Merge "Revert "Pass host cpu flags to compute guests""Michal Skalski1-3/+0
2016-08-10Revert "Pass host cpu flags to compute guests"Michal Skalski1-3/+0
This reverts commit 34da00c2baa6abc69a812aae4c30a82ebae561bd. Change-Id: I495fa1f71ac30e259ca63e90ca8b38dd2300d469 Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-08-10Merge "Provide access to mgmt network from host level"Michal Skalski4-24/+25
2016-08-10Fix merge_dicts logic for the case of two nonempty listsFedor Zhadaev1-9/+11
JIRA: FUEL-170 Change-Id: I5abae6fc950cdabe064b5402d9555cedf81cfc23 Signed-off-by: Fedor Zhadaev <fzhadaev@mirantis.com>
2016-08-10Pass host cpu flags to compute guestsMichal Skalski1-0/+3
Both kvm and ovs plugins require specific cpu flags. Host-model mode will pass most of the host cpu flags to guest. JIRA: FUEL-157 Change-Id: Iff620a4b4f5948e54f6f8db01411d6659f08ec00 Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-08-10Provide access to mgmt network from host levelMichal Skalski4-24/+25
Functest framework is trying to access internal endpoints from host level which currently is not possible in virtual deployments. Move mgmt network to untagged interface and setup IP address from mgmt subnet on the linux bridge where mgmt traffic is traversing. There will be corresponding changes in securedlab repository. JIRA: FUEL-167 Change-Id: I29b8ebb23a64e39a4e56b27639a87ce2386b9774 Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-08-04Fix OVS scenarios to use fuel-plugin-ovsFedor Zhadaev3-352/+78
* Use fuel-nshovs instead deprecated fuel-nfvovs * Modified scenario to enable DPDK via Fuel * Removed hard dependency from specific POD * Add ability to merge networks lists JIRA: FUEL-156 JIRA: FUEL-162 Change-Id: Ie609ff140f1de96e54df37dd9b1881afec792317 Depends-On: Ic6072d938e09a40516c32cdde6223d0a21e57403 Signed-off-by: Fedor Zhadaev <fzhadaev@mirantis.com>
2016-08-03Fix config for no-ha kvm scenarioMichal Skalski1-4/+4
JIRA: FUEL-157 Change-Id: I09e595902b2c467b5522b7b37a772f7ab35c8cea Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-08-02Merge "Add functionality to generate a base DEA file"Michal Skalski2-5/+55
2016-08-02Merge "Make it possible to include files in templates"Michal Skalski2-0/+110
2016-08-02Merge "Refactor deploy-config.py"Michal Skalski1-96/+147
2016-08-02Add functionality to generate a base DEA filePeter Barabas2-5/+55
- Add template file for base DEA Change-Id: I8055087b992fdc9850852bad9fa07a4e4fde0085 Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-08-01Make it possible to include files in templatesPeter Barabas2-0/+110
Change-Id: I45c42ac65cfbe6562f0035df3375a2231148e22e Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-08-01Refactor deploy-config.pyPeter Barabas1-96/+147
- fix vertical whitespace - more consistent function naming - clean up file writes - break up some long lines - typo fixes - remove duplicate spaces - unify print's Change-Id: I5517747ef9f2e39ade7fb553ae2b1547fdf7b9e1 Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>