summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-09-21Adds single NIC support for baremetal deploymentsTim Rozet1-84/+210
Simply use a new argument "-single_baremetal_nic <nic name>" to define which NIC to bridge to on your host. Also ensure when using this arg that your ksgen_settings file has mac_address and private_mac as the same value for your controllers (since you are using a single interface). JIRA: APEX-33 Change-Id: I69095ccc4b907ae3c6ea3e88b2d1c9af9894c5cb Signed-off-by: Tim Rozet <trozet@redhat.com> (cherry picked from commit f6947d7d35d5b0dd3a8a38152a367d9422b81279)
2015-09-21Merge "Grant access for Fuel VM to external public network" into stable/arnoTim Rozet4-18/+43
2015-09-21Grant access for Fuel VM to external public networkSzilard Cserey4-18/+43
Change-Id: I429d41ea9942321fb4768a5a4d46d0976adbf47d Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>
2015-09-21Modified cache naming. Now the cache name comprises an xor of the following:Jonas Bjurel1-1/+35
- config.mk - cache.mk - Upstream fuel commit-id This should avoid any cache flapping, and insted produce a unique cache for any permutation of the above identities. Change-Id: Ieb28748ae9075725e54f6a5e87740281bf81116e Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2015-09-21FIX raise ExceptionSzilard Cserey1-4/+5
Change-Id: Ia1ded0e6de426b97de6aec9c0ff5225ea63a8c91 Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>
2015-09-20Merge "Missed a reference to prepare target which was earlier used by odl" ↵Jonas Bjurel1-2/+2
into stable/arno
2015-09-20Merge "Tidied up the last references to ODL" into stable/arnoJonas Bjurel3-17/+3
2015-09-18FIX for temporary ISO directory cleanupSzilard Cserey4-67/+44
Move plugin installation in Fuel installer Change-Id: Ibb24da448681fb70686a1f59738bd9fdda12e9d0 Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>
2015-09-18Updates for AutodeployerSzilard Cserey28-8300/+37
-Remove pre-deploy mechanism -Update reaping mechanism -Remove old DEA, DHA configuration files Change-Id: Ibc28d148bc23992e940e0247873a226d92fb7af7 Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>
2015-09-18Corrects the default route on controllersrandyl4-1/+22
BGS-84 After the changes to br-ex on the control nodes. The default route was no longer correct on the control nodes in bare metal deployments. Added an admin_network paramater for barmetal deployments. Added logic on br-ex in to set DEROUTE=no on the admin network in the extern_net_presetup. Tested on HA physical deployment. Change-Id: Ic4b1ef521da2c55590990411f3f2444d4c94b019 Signed-off-by: randyl <r.levensalor@cablelabs.com> (cherry picked from commit 7dc718a545c2da1b7bf150bf652705aeb98b245c)
2015-09-18Missed a reference to prepare target which was earlier used by odlJonas Bjurel1-2/+2
Change-Id: Ief101627e2af51c4b565dcb5d230922c5f113c8d Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com> (cherry picked from commit 0011674c45680df6c1fe9491c974eb3e57a4a0fe)
2015-09-18Tidied up the last references to ODLJonas Bjurel3-17/+3
Change-Id: I715f47461622f2d26a492eb61d68b20ca84825aa Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com> (cherry picked from commit 4d23d9a0079735322c88e53a8ebb1c4d2c0b1566)
2015-09-18Fixed cache logicJonas Bjurel1-6/+4
Change-Id: I904a4b8ebcab5aedefef287ff8bb5357dae8e3ff Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2015-09-18Fix to solve issues around cache archives having trailing garbageJonas Bjurel1-137/+185
Change-Id: I69689767e423cf469b5fdf2e40bb0cc931628002 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2015-09-16Merge "adding files to the build cache to reduce bandwidth by reusing ↵Tim Rozet3-7/+11
already downloaded build dependancies reverting git archive to use HEAD, jenkins checks out the correct branch so we can rely on head" into stable/arno
2015-09-16FIX for AutodeployerSzilard Cserey4-16/+45
- Fuel installation - fix for finding fuelmenu - ugo+rwx access rights to autodeploy.log file - backward compatibility for argument parsing of ISO, DEA, DHA Change-Id: Ib4ad5b0868a25b0357cfcd9d8f644bb3a0703b25 Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>
2015-09-16Autodeployer support for ODL Plugin installation + Fuel 6.1Szilard Cserey61-643/+4840
- Opendaylight plugin installation - Adapting Autodeployer to Fuel 6.1 - restarting blades that couldn't be discovered Fuel in time BGS-87 Autodeployment restarts blade if that has not been discovered by Fuel BGS-90 Fuel 6.1 and Opendaylight Fuel plugin install support for Autodeployer Change-Id: I83aab3f8caf368a70fd3f2b67c7ba1b6191993c6 Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>
2015-09-15adding files to the build cache to reduce bandwidth by reusing already ↵Dan Radez3-7/+11
downloaded build dependancies reverting git archive to use HEAD, jenkins checks out the correct branch so we can rely on head Change-Id: Iaf308ebdbd72e96c87fb49ee04168a7e9a905d98 Signed-off-by: Dan Radez <dradez@redhat.com>
2015-09-15Merge "FIX for bringing down pxebr in clean.sh" into stable/arnoTim Rozet1-2/+9
2015-09-15Merge "changing branch to checkout from to arno/stable and placing all repo ↵Tim Rozet2-4/+5
contents into /root instead of deploy.sh only in /bin" into stable/arno
2015-09-15FIX for bringing down pxebr in clean.shSzilard Cserey1-2/+9
Wait for 5 seconds after pxebr has been brought down Change-Id: Ic9e64a484eeab6be63df3c7c4b9b98bed1cd2ed4 Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>
2015-09-15FIX for using qemu instead of kvm as hypervisor in virtual environmentSzilard Cserey2-2/+2
Change-Id: Ib02c98e9410fc98a23379f9e40291763d354a8a8 Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>
2015-09-14changing branch to checkout from to arno/stable and placing all repo ↵Dan Radez2-4/+5
contents into /root instead of deploy.sh only in /bin Change-Id: I5c7c3a990bf18480b1e99a2119363e30e68e6d12 Signed-off-by: Dan Radez <dradez@redhat.com>
2015-09-14Refactoring build system to support Fuel 6.1Stefan K. Berg55-2273/+440
As Fuel 6.1 has changed both Debian package handling (fetching repositories from Internet) as well as Puppet packaging, the support for patching these has been disabled. The pre-deploy logic of Fuel has been removed together with a number of patches applied on top of a Fuel build, among them fixes for NTP, DNS and /etc/hosts injection. Instead, when changed default behavior is required, this will be introduced as Fuel plugins which more cleanly integrates into the Fuel system, and also decouples additional functionality from the ISO build stage. Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2015-09-11Allows domain name to be configuredTim Rozet4-19/+26
Users may now provide domain_name in the ksgen settings file (along with setting the correct and respective hostnames). This domain name will be used for all of the deployed machines. JIRA: BGS-86 Change-Id: I34b6da07dd565648399ea7a1abf2abe1ae62d91a Signed-off-by: Tim Rozet <trozet@redhat.com> (cherry picked from commit 1089c79563e61589d105accc3067f6ebbd3020ed)
2015-09-11Foreman deploy.sh bug corrected when finding the interfacesjose.lausuch1-1/+2
Change-Id: Ifb1ab47017ab28fab0a39961c2fd7728d2098cda Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com> (cherry picked from commit cf15cf80302559a1647d243187240cfca1efaad2)
2015-09-10Adds functionality to modify VM resourcesTim Rozet6-6/+177
VM resources (vcpus, memory, disk size) are now configurable in the opnfv_ksgen_settings files. Each node in the ksgen settings file now has "memory, cpus, disk" attributes: - cpus is an integer number of CPUs to assign to the VM - memory is an integer size in kilobytes - disk is an integer size in gigabytes The vagrant box vmdk is resized for each VM. Each VM will then modify its partition to the new size, execute the normal reboot, then extend the physical+logical volumes and filesystem using vagrant provisioning scripts. JIRA: APEX-1 Change-Id: I471319db14d2189052961b2f533c65850ebeb1e7 Signed-off-by: Tim Rozet <trozet@redhat.com> (cherry picked from commit 5384a722ffae47bc3519512d34802102ebc7be5b)
2015-09-09Fixes horizon IP URL for non-HA deploymentsTim Rozet1-1/+15
The printed horizon URL at the end of a successful deployment was incorrect for non-HA deployments. The private IP was being printed which is not publicly accessible. This patch fixes the URL printed to be the public IP of the control node - the correct URL. JIRA: APEX-12 Change-Id: Ia2f594e0cf839a9100c3bf5715a38fe4fd243bfe Signed-off-by: Tim Rozet <trozet@redhat.com> (cherry picked from commit db4a9ac5492659cd435b4e4e84868510259c6b29)
2015-09-08Adds check to ensure that provided static_ip_range param is correctTim Rozet1-0/+7
Patch adds a check to make sure that the user specified static_ip_range argument (Ex. 192.168.0.10,192.168.0.20) falls within the valid public subnet of the host (the same subnet as the default gateway). JIRA: APEX-19 Change-Id: Ifc0b79074b887509617c2749e50d97d1800abad0 Signed-off-by: Tim Rozet <trozet@redhat.com> (cherry picked from commit 50fe670726f2229ef963517a890fef2d821b8821)
2015-09-08Merge "Merge branch 'master' into merge-master-arno" into stable/arnoTim Rozet238-2830/+16150
2015-09-07FIX for ip link state verificationSzilard Cserey1-1/+1
Change-Id: Ibe0840a74b9fe7fc0041ce92190cf82f25ae9298 Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>
2015-09-04Merge branch 'master' into merge-master-arnoDan Radez238-2830/+16150
Change-Id: Idbe1d8ba5f1fe44ae5c5e407d5999c28909639c5 Signed-off-by: Dan Radez <dradez@redhat.com>
2015-09-03Fixes bug in looking for interfacesTim Rozet1-1/+1
Issue where the wrong field was being used for finding interfaces. JIRA: APEX-11 Change-Id: I94635837c73acd0d271dbc9d0474dc5ba688ff10 Signed-off-by: Tim Rozet <trozet@redhat.com>
2015-09-03Fixes setup.sh pxebr checksTim Rozet1-3/+4
Bug where pxebr was checking for link state UP before the subinterface was added to the bridge. Moved the check to be after. Added a short sleep in between issuing the link up and checking link status. JIRA: OCTO-109 Change-Id: I7f782a35adf49b0da675e932d109c41b26016a5b Signed-off-by: Tim Rozet <trozet@redhat.com> (cherry picked from commit 87157c0dc9bd2a3da709d1cf980cce2e9c5469a3)
2015-09-02Fixes IP/MAC of inventory for lab reconfigTim Rozet1-18/+18
JIRA: OCTO-109 Change-Id: I272a1f9f12454ff71a8a1915ab7b712474b84832 Signed-off-by: Tim Rozet <trozet@redhat.com> (cherry picked from commit 1facde0bf0d51035cfed819e7680145969c6174d)
2015-09-02Merge "Fixes external network to services tenant and no dhcp"Tim Rozet1-2/+3
2015-09-02Merge "Removes default vagrant route from virtual nodes"Tim Rozet1-0/+1
2015-09-01Fixes issue with deploy copying from /tmp and clean bailing earlyTim Rozet2-5/+4
deploy.sh was failing in user deployments because the necessary puppet modules and vagrant files were being copied accidentally from /tmp and not the script directory. This patch fixes that issue. clean.sh was failing checks to see if vagrant or virtualbox was still running, due to a bug with checking "ps" and using grep. This patch resolves that. JIRA: APEX-16,APEX-17 Change-Id: I1faa6fc134c0308acb2e7b14be30f7cd3c99d109 Signed-off-by: Tim Rozet <trozet@redhat.com>
2015-09-01Fixes external network to services tenant and no dhcpTim Rozet1-2/+3
External network should have been provisioned as services tenant. The external network and subnet are both changed with this patch. The external subnet is also now configured to disable dhcp. JIRA: APEX-9, APEX-10 Change-Id: I3e41dc4b0678efeb0824259147008cf455d8de1e Signed-off-by: Tim Rozet <trozet@redhat.com>
2015-09-01Removes default vagrant route from virtual nodesTim Rozet1-0/+1
Removes default gateway route to 10.0.2.2 after adding public default route JIRA: APEX-2 Change-Id: I7ba23e916f3995f39ee1677007ae5c1612cb3cc9 Signed-off-by: Tim Rozet <trozet@redhat.com>
2015-09-01Removes pxebr in clean.sh, updates setup.shTim Rozet2-4/+22
pxebr bridge is needed by Fuel, but causes issues with Foreman. It is now removed in clean.sh. setup.sh is also updated to be executable and fixes a bug where grep was being used on output that is in stderr. JIRA: OCTO-109 Change-Id: I037e168e40f3352a61a604ed6cea21d10250b434 Signed-off-by: Tim Rozet <trozet@redhat.com> (cherry picked from commit 30361efb7d3bf9525e9d9aadd5c137e9a654d1a4)
2015-09-01Adding prep script for Fuel DeploymentSzilard Cserey2-1/+178
Change-Id: If9bf1e1de27a0564a7d6fd0184dc80073bc060e6 Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com> (cherry picked from commit c4a78e86d6d0eafb754a2bab3323d117ae507494)
2015-09-01Adds common clean script for CI infrastructureTim Rozet1-0/+236
Universal clean script will remove VirtualBox or libvirt/KVM VMs and related hypervisor packages/kernel modules. The script is meant to be executed prior to a deploy to clean the jumphost. The script will also power off baremtal nodes via IPMI. These nodes are defined in yaml and passed via argument -base_config. JIRA: OCTO-109 Change-Id: I933b3d505b290d65996d60bf465144d92d433315 Signed-off-by: Tim Rozet <trozet@redhat.com> (cherry picked from commit 6de2b5425491885a660748b0aced2f2c2363e07f)
2015-09-01Merge "Fixes puppet modules to come from Genesis repo"Tim Rozet5-78/+85
2015-08-31Fixes puppet modules to come from Genesis repoTim Rozet5-78/+85
This patch deprecates the use of puppet-trystack repo and migrates the puppet modules even to Genesis. deploy.sh now now copies the modules from the current Genesis repo into foreman VM's /vagrant to be used during install (rather than recloning). Associated changes in Khaleesi/QuickStack: - Khaleesi: commit 31b912778847f295d1459a71e5c41c808977c91d - Astapor: commit ac4be11e348d7bcff1e1aa28c96056e18dba5291 JIRA: APEX-8 Change-Id: I322ac797d1d687f17434e07e6775acef8961bdef Signed-off-by: Tim Rozet <trozet@redhat.com>
2015-08-28Fixes bug with interface detectionTim Rozet1-3/+3
This patch addresses the detection of the physical NICs to bridge to. There was a bug where the regexp would ignore some NICs on accident, and the purpose of the expression was to ignore virtual NICs. Rather than ignore NICs by their name, this patch ensures that NICs are ignored if they are actually virtual types. Also fixes syntax issue with checking for nic_arg_flag. JIRA: APEX-11 Change-Id: Ibd965c454faab1d751e3ce0b260eabc7fbe7c720 Signed-off-by: Tim Rozet <trozet@redhat.com>
2015-08-28Merge "Adds ability to specify NICs to bridge on the jumphost"Dan Radez1-109/+139
2015-08-27Merge "Fixes vagrant base box to be opnfv"Tim Rozet2-3/+3
2015-08-27Merge "Adds baremetal node power check before attempting deploy"Tim Rozet1-0/+68
2015-08-27Merge "Adds check to ensure 3 control nodes are defined with HA"Tim Rozet1-0/+14