aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-05-03deployment.py: stdout not consumed when deploying changesJosep Puigdemont1-3/+9
During the automatic deployment, when the environment is ready to be deployed, the deploy.py script will spawn a shell process that will perform the command "fuel deploy-changes". The standard output of this process is then piped to a "tee" process, which redirects the output to the standard output of the shell process, and to a file named cloud.log. The file is monitored by the deploy script to find out the status of the deployment, and print it to the log file of the automatic deployment script, including percentages for each node being provisioned. However, the deploy script never consumes the standard output of the shell process. If the shell process produces enough output, its standard output buffer will fill up, thus making the tee process block trying to write to its standard output, and the cloud.log file will not be updated. At this point, the deploy process, which is monitoring cloud.log, will not detect any progress in the deployment, and eventually it will time out and assume the deployment failed, although it might have finished fine after that. The solution here is to remove the "tee" process from the shell command, and instead redirect standard output to the cloud.log file. Another solution would be to actually parse the standard output of the shell command from the deploy script itself, but that would require a bit more work, as reading a line at a time might block the script. Finally, with this patch the cloud.log file won't be deleted unless the shell process has already finished. Change-Id: I03a77be42d220b1606e48fc4ca35e22d73a6e583 Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
2016-04-30deploy.sh: do not expect a parameter for -hJosep Puigdemont1-1/+3
If -h was given as a parameter to the script, it would report an error as it expected a parameter, and if it was called as the only parameter, it would run deploy.py as if "old style" parameters had been given, thus showing the usage for the python script, instead of the expected usage message for this script. Update the usage message to include -h. Change-Id: I0930936962c1cb479ec4409ff114cd60a386b276 Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
2016-04-29Merge "Updating project lead, and link of approval"Jonas Bjurel1-3/+3
2016-04-29Merge "Add a dha adapter python file for ZTE hardware."Jonas Bjurel3-1/+53
2016-04-29Updating project lead, and link of approvalAric Gardner1-3/+3
Change-Id: Id265bb022a4c509e642e8f8b61a65c5cfb05c1b7 Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>
2016-04-28Merge "Clean up scenario files"Jonas Bjurel54-3949/+19
2016-04-28INFO file updated with Greg and Nikolas as committersJonas Bjurel1-0/+2
Change-Id: I9a64e5948e159362cb851777db6de41eccb2a599 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2016-04-28Fix handling of relative ISO path on the CLIPeter Barabas1-3/+4
Change-Id: I32878726432c3d883f0b33bdd2c836b0770e734f Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-04-28Clean up scenario filesPeter Barabas54-3949/+19
- remove release from scenario files - remove old versions of scenario files - remove versions from scenario file names and update scenario.yaml - update README Change-Id: I5203ea0794b96fb44f6a9db25b33e5066c1d9574 Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-04-28Add a dha adapter python file for ZTE hardware.wu.zhihui3-1/+53
ZTE hardware need use IPMI command "chassis power cycle" on function node_reset(). JIRA: FUEL-127 Change-Id: I286fd9cda43d2e1799b134f0a391f57d08cd1928 Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>
2016-04-27Updated documentation for Brahmaputra 3.0 follow-up releaseJonas Bjurel5-44/+58
READY TO MERGE Change-Id: Ic481f02375af9be1642791fa6d96856a453c4f29 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2016-04-26Merge "configure_environment.py: quote environment name"Michal Skalski1-1/+1
2016-04-26Merge "Using VLAN segmentation for the NFV-OVS scenarios. Unfortunately this ↵Jonas Bjurel3-2/+524
scenario is hardwired to work with Ericsson POD-2 only"
2016-04-26Using VLAN segmentation for the NFV-OVS scenarios.Jonas Bjurel3-2/+524
Unfortunately this scenario is hardwired to work with Ericsson POD-2 only Change-Id: I3a0b56d7ff71e0ec9cd97b8ef5946fb438d43e62 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2016-04-25configure_environment.py: quote environment nameJosep Puigdemont1-1/+1
The Fuel environment name may contain spaces, putting the name in quote marks prevents the second and subsequent words from being interpreted as other parameters by the fuel command. The name could contain double quotes too, so this doesn't solve all problems, but arguably the most common case. Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
2016-04-22Correction due to changed cpio behaviorStefan K. Berg2-0/+38
As part of a security fix for cpio, its behavior has changed in terms of how symlinks are handled. This is affecting the Fuel build process, for which this commit is a fix (reverting cpio back to its original behavior by adding the argument "--extract-over-symlinks" in those instances where this is needed). For details, see https://jira.opnfv.org/browse/FUEL-125 Change-Id: I455b11a16ad52d8dd09165165447e4c4a661b45a Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2016-04-15[VPNSERVICE] Bugfix Broadcast GroupNikolas Hermanns1-1/+1
The local broadcast group was not updated correctly in ODL. This commit includes the bugfix. Change-Id: I7857bcdc543217d513683bf91ab13fa93ba2ed42
2016-04-14Adding patch for Broadcast Storm of vpnserviceNikolas Hermanns1-1/+1
There is no persisten release from stable/beryllium with the bugfix https://git.opendaylight.org/gerrit/#/c/37566/ included. So we have to overwrite the file we a own build. Change-Id: I637c333fa2175544f182cd1f7b774501d3fc2c25
2016-04-13Fix odl haproxy configurationMichal Skalski1-1/+1
In rare cases ODL haproxy configuration had been deployed before haproxy service was ready. This patch should force proper order. Change-Id: I7c90a57bab5e3388bf29aefabe6ed9380d1303f6 Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-04-11Redo config of plugin buildNikolas Hermanns2-8/+30
- Split up config into a new config file - add revision to better point to a branch instrad of a revision. Change-Id: I341138973b56fb0807478ee08cab039ab31d6503
2016-04-08Merge "Remove duplicate import of hashlib"Jonas Bjurel1-1/+0
2016-04-08Merge "Cleanup and add bgpvpn to scenario file"Jonas Bjurel5-605/+23
2016-04-08Cleanup and add bgpvpn to scenario fileNikolas Hermanns5-605/+23
Change-Id: I82ce16751b4d52d6fdb39883b730073164f9dfe0
2016-04-07Merge "Fix wrong indentation"Jonas Bjurel1-2/+2
2016-04-07Uplift fuel-plugin-bgpvpn repoNikolas Hermanns1-1/+1
Change-Id: I8d888628f66e1661486eb6ef79240a61da83a211
2016-04-07Fix wrong indentationPeter Barabas1-2/+2
Change-Id: I215da0a101d94e2c3fd4aeea80b98f7c9aefe0fb Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-04-07Remove duplicate import of hashlibPeter Barabas1-1/+0
Change-Id: I306b8260ea37fb32ef8db8cf5d4628b50328027f Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-04-06Merge "Enable BGPVPN_extension/SDNVPN_feature"Daniel Smith2-0/+202
2016-04-06Merge "Fix for breaking deployment."Daniel Smith1-0/+2
2016-04-06Merge "Fix KVM/QEMU plugin bug"Jonas Bjurel1-1/+1
2016-04-06Merge "Use Opendaylight_SR-1"Michal Skalski1-2/+2
2016-04-06Enable BGPVPN_extension/SDNVPN_featureNikolas Hermanns2-0/+202
This commit includes the bugfixes and changes for BGPVPN_extensions and SDNVPN_feature of ODL. Change-Id: I9832680109edae497f7a344d5626568d3a335a15
2016-04-06Use Opendaylight_SR-1Nikolas Hermanns1-3/+3
In order to use the lates ODL build also the fuel-plugin-opendaylight is uplifted. Change-Id: Ic38d46818110c2b62920f2146cd406705d8e3673
2016-04-06Fix for breaking deployment.Nikolas Hermanns1-0/+2
If no vm definition is give, nothing should happen. Change-Id: I1fd01ef43fa3e5eab4a794c63254eaf6d80fc951
2016-04-05Merge "Configure the infra VMs over DHA"Daniel Smith5-18/+81
2016-04-05Merge "Enable merge of the versions struct of a plugin"Daniel Smith1-3/+48
2016-04-05Enable merge of the versions struct of a pluginNikolas Hermanns1-3/+48
Redoing this the reverted patch. The original idea that everyone which wants to merge lists has to code that, is not wanted. So the Exception will become a warning. This reverts commit 552536f5319d6ead73118d0cfd701d648e99df28. Change-Id: Ib15541199054da27c1a2aec68b5c1436da9622c9
2016-04-05Fix KVM/QEMU plugin bugdavidjchou1-1/+1
1. fix deployment error issue for Ceph co-located with Compute node Change-Id: Idd4985b92121fa46f6ae70894b65fdae358f8aa3 Signed-off-by: davidjchou <david.j.chou@intel.com>
2016-03-24Merge "small fix for deploy.py invocation"Szilard Cserey1-6/+9
2016-03-22Fix KVM/QEMU plugin bugdavidjchou1-1/+1
1. fix nested virtualiztion in realtime kvm Change-Id: Id4e2790e6640f142d0446667d0c7e8480f38ebbc Signed-off-by: davidjchou <david.j.chou@intel.com>
2016-03-19Merge "Storage fix for the KVM scenario"Jonas Bjurel3-2/+337
2016-03-18ODL Plugin: new branch for SR2 releaseMichal Skalski1-1/+1
Change-Id: If868bfbe59711e198998945a9ef5e0de985939fc Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-03-18Configure the infra VMs over DHANikolas Hermanns5-18/+81
This commit enables the full configuration of the VM(fuel/controller/compute) defintion through the dha file. Change-Id: I4e78334d1e5aec1e98667343390283587f0b3ea5
2016-03-18Storage fix for the KVM scenarioJonas Bjurel3-2/+337
- Ceph is used with a replication factor of 1 - In no-ha, a separate node is used for ceph-osd - In ha, one of the controllers is used for ceph-osd Change-Id: Ibb00b385fe138374e380839fbc12067fd71c2a26 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2016-03-15Merge "Revert "Enable merge of the versions struct of a plugin""Jonas Bjurel1-40/+3
2016-03-15Revert "Enable merge of the versions struct of a plugin"Jonas Bjurel1-40/+3
This reverts commit 0eabb596edefd6562a892f27f4e838d9d21c5243. Change-Id: Ifc4cb5bd12bdf50f0dd903af66037a428aed0201
2016-03-14Merge "Fix network connection check issue"Jonas Bjurel1-1/+1
2016-03-11small fix for deploy.py invocationSzilard Cserey1-6/+9
Change-Id: I8587500c71f05ca69645422ae110651196e0cad2
2016-03-11Merge "Enable merge of the versions struct of a plugin"Jonas Bjurel1-3/+40
2016-03-11Merge "Get user id without forking a shell."Jonas Bjurel1-2/+2