summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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
2015-08-27Fixes vagrant base box to be opnfvTim Rozet2-3/+3
Chef removed the centos7 basebox from Atlas. A new opnfv base box was added. This patch includes the modifications necessary to point to that new box. JIRA: APEX-14 Change-Id: I7e74726c692f21583d0d70f9dd7558665dfb5d99 Signed-off-by: Tim Rozet <trozet@redhat.com>
2015-08-27Adds baremetal node power check before attempting deployTim Rozet1-0/+68
Ensures nodes are shutoff if a baremetal deployment, before attempting to deploy. Previous behavior is deploy will run up to Foreman pxeboot, then fail. We can save a lot of time by detecting this up front. Nodes must be shutoff before deploying. JIRA: BGS-68 Change-Id: Ie585e12a5271bc1baac60f6256f85e5cb1b1baeb Signed-off-by: Tim Rozet <trozet@redhat.com>
2015-08-27Adds ability to specify NICs to bridge on the jumphostTim Rozet1-109/+139
This patch adds new functionality to be able to specify the physical interfaces on the jumphost to bridge to (rather than figured out dynamically). The patch introduces new args for each nic: - admin_nic - private_nic - public_nic - storage_nic The public_nic is the only arg to be used when using -virtual. In baremetal: admin_nic, private_nic, and public_nic must either be all or none specified. The patch also cleans up virtual node logic, which was working, but had unnecessary logic. JIRA: APEX-4 Change-Id: Ic0a2e1d8ce2b7464441e3e9041faf123b86ca7e6 Signed-off-by: Tim Rozet <trozet@redhat.com>
2015-08-27FIX for DHA libvirt templateSzilard Cserey2-12/+12
Change-Id: I5c04770970fc781f1c7f95ef0f8e308f2c541f89 Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>
2015-08-27FIX for DHA libvirt templateSzilard Cserey2-12/+12
Change-Id: I5c04770970fc781f1c7f95ef0f8e308f2c541f89 Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>
2015-08-27Merge "Removed ODL_DOCKER implementation (DEPRECATED FOR PLUGIN ARCH IN FUEL ↵Daniel Smith22-1469/+0
6.1/SR1 OF ARNO)"
2015-08-26Adds check to ensure 3 control nodes are defined with HATim Rozet1-0/+14
New check makes sure that 3 controller nodes are defined in base_config when ha_flag is set to true in base_config. JIRA: APEX-7 Change-Id: I7f49dec82704d8c9cbbcf17eb004b0adede406b3 Signed-off-by: Tim Rozet <trozet@redhat.com>
2015-08-25Merge "Fixes Foreman clean to not hang and removes libvirt"Tim Rozet1-51/+89
2015-08-25Removed ODL_DOCKER implementation (DEPRECATED FOR PLUGIN ARCH IN FUEL ↵Daniel Smith22-1469/+0
6.1/SR1 OF ARNO) Change-Id: I8643d268c5d5e3395725667deb50b5f9df7c3f09 JIRA:0 Signed-off-by: Daniel Smith <daniel.smith@ericsson.com>
2015-08-25Removed opendaylight build capabilities as a preparation toward Arno SR1Jonas Bjurel12-685/+1
Note: The local branch name "removedocker" is missleading! Change-Id: I4086bb3f47f720407a6356796a9724367cca2898 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2015-08-24Fixes Foreman clean to not hang and removes libvirtTim Rozet1-51/+89
Fixes clean so that it does not hang when base_config is not provided. Also now removes libvirt libraries which conflict with VirtualBox required for deploy. JIRA: BGS-78 Change-Id: I7c71ca207f260eafb1fb97ace764b9d288fc258a Signed-off-by: Tim Rozet <trozet@redhat.com>
2015-08-20Fixes 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>
2015-08-19Removes 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>
2015-08-19Merge "Adding prep script for Fuel Deployment"Tim Rozet2-1/+178
2015-08-19Adding prep script for Fuel DeploymentSzilard Cserey2-1/+178
Change-Id: If9bf1e1de27a0564a7d6fd0184dc80073bc060e6 Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>
2015-08-18FIX for missing ks.cfg.patch fileSzilard Cserey1-0/+19
Change-Id: I2a204a9119c20cc1ab3a1a20807593454d5b1cd4 Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>
2015-08-18FIX for missing ks.cfg.patch fileSzilard Cserey1-0/+19
Change-Id: I2a204a9119c20cc1ab3a1a20807593454d5b1cd4 Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>
2015-08-14FIX for stealing POD-2 Jumphost IP address 172.30.10.72Szilard Cserey2-12/+12
Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>
2015-08-14Adding LF POD2 config files for AutodeployerSzilard Cserey8-3/+2001
Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>
2015-08-13FIX for stealing POD-2 Jumphost IP address 172.30.10.72Szilard Cserey2-12/+12
Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>
2015-08-13Merge "Adding LF POD2 config files for Autodeployer"Tim Rozet8-3/+2001
2015-08-13Merge "Adds common clean script for CI infrastructure"Tim Rozet1-0/+236
2015-08-13Adding LF POD2 config files for AutodeployerSzilard Cserey8-3/+2001
Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>
2015-08-13Needed rebase after fuel dev-ops changesJonas Bjurel5-4/+46
Patch needed after updated fuel devops repo key change Reference: https://github.com/stackforge/fuel-main/commit/82e77c7f476a23220f44b74c7f32fc04a7189a4e#diff-9d30c16c74e663e5cdb1dc7d9189ed2d Patch needed after updated fuel devops python package versions Reference: https://github.com/stackforge/fuel-main/commit/a765460d3fd69089e3b4d2b3a6b55e28e6fb53eb Rebased site.pp Change-Id: I138b383b0d57091a81f98acae3b6e7af6a189632 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com> (cherry picked from commit 82b3389ae1907b04c1d57a8ce87708726b00277a)
2015-08-12Needed rebase after fuel dev-ops changesJonas Bjurel5-4/+46
Patch needed after updated fuel devops repo key change Reference: https://github.com/stackforge/fuel-main/commit/82e77c7f476a23220f44b74c7f32fc04a7189a4e#diff-9d30c16c74e663e5cdb1dc7d9189ed2d Patch needed after updated fuel devops python package versions Reference: https://github.com/stackforge/fuel-main/commit/a765460d3fd69089e3b4d2b3a6b55e28e6fb53eb Rebased site.pp Change-Id: I138b383b0d57091a81f98acae3b6e7af6a189632 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2015-08-12Adds 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>
2015-07-28Merge "speed up the installation of compass"Tim Rozet17-55/+612
2015-07-28Merge "update ansible roles directory for supporting commpass-core installing"Tim Rozet120-38/+13
2015-07-27Fixes IP/MAC of inventory for lab reconfigTim Rozet1-18/+18
JIRA: OCTO-109 Change-Id: I272a1f9f12454ff71a8a1915ab7b712474b84832 Signed-off-by: Tim Rozet <trozet@redhat.com>