summaryrefslogtreecommitdiffstats
path: root/deploy
AgeCommit message (Collapse)AuthorFilesLines
2016-06-13Modification of deployment config for Fuel 9 and ELX labStefan K. Berg3-169/+304
Change-Id: I380087889cda079a56c8cea3acc13145dcd49046 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2016-06-08Fix for not reaping 'ssh_network'Peter Barabas1-1/+1
Change-Id: Ib225701a808211e50554c8f1762325aa75ecc33f Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-06-06Merge "Build odl plugin for mitaka"Michal Skalski4-88/+280
2016-06-02Build odl plugin for mitakaMichal Skalski4-88/+280
Change-Id: I59b96a424a753f880b4ac16abd806851ad3f9533 Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-06-02Download deployment config after modificationPeter Barabas1-0/+6
Modified network or interface configurations were not reflected in the deployment config, resulting in faulty node configurations. Change-Id: I4ca20702c0171e7995f2b4f46317557ec9d5beac Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-06-01Auto deploy corrections for Fuel 9.0Stefan K. Berg3-2/+3
- The auto deployer's detection of nodes being up corrected as "fuel node" now returns "1" instead of "True" to denote that the node is up. - The location of bootstrap_admin_node.sh has changed so the detection of whether the Fuel node installation needed a correction for the deployer not to throw an exit code and terminate prematurely. - Small fix: deploy.py is now executable (just a chmod change). Change-Id: I8fed7bafe6912f8b4278619bbdaa16577a82737b Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2016-06-01Clean up after ourselvesPeter Barabas1-0/+2
Change-Id: Id7579ef618b8cd922de325d9dc1c0b7a6c5587a7 Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-05-31A small edit for the uplift to Mitaka from LibertyDaiel Smith1-1/+1
Signed-off-by: Daiel Smith <daniel.smith@ericsson.com> JIRA:0
2016-05-31common.py: catch stderr in exec_cmdJosep Puigdemont1-6/+6
When running commands with exec_cmd(), the stderr of the command is sent to /dev/null and ignored, and only stdout is retrieved. Thus, when a command fails and check is enabled, only the output of stdout is presented to the user, which normally holds no information about the error. In this patch we retrieve stderr, and when an error occurs, an exception is raised with that message. Fixes https://jira.opnfv.org/browse/FUEL-142 Change-Id: I3940e1a43963a6abec362481b1d4ce7bd7cb816d Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
2016-05-31Merge "Build system uplift to Fuel 9.0/Mitaka"Stefan K. Berg2-3/+2
2016-05-30Merge "Remove residual Lab & configuration DEA and DHA from the unprotected ↵Jonas Bjurel28-9381/+0
Fuel repo"
2016-05-30Build system uplift to Fuel 9.0/MitakaStefan K. Berg2-3/+2
Switching to Fuel 9.0/Mitaka for the build system. Overhaul of the patching mechanism. As bootstrap_admin_node.sh has been transitioned into an RPM (fuel-support), the lazy designer found it more simple to patch that script during the Fuel build phase than at the OPNFV ISO generation. The patch mechanism has been changed to a normal context diff instead of the orig/modified file tuples previously used. Hopefully this will require fewer manual rebases (may the fuzz be with us!). Also the ks.cfg patching has transitioned to a context based ordinary patch for the same reasons, but this is as before taking place during OPNFV ISO generation. Patch naming made more descriptive. The reaping mechanism has been slightly modified due to a change in the naming of the node files when these are generated by the Fuel CLI. IMPORTANT 1: The package cache mechanism is currently disabled, it is only possible to install Fuel with a direct internet connection. This will be fixed in a later change set! IMPORTANT 2: All plugins has been disabled! As you have re-certified your plugin with Fuel 9.0, please re-enable it in build/Makefile! Change-Id: Ia918d16a74b68f89d178e06befe6e8a7a9367bf9 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2016-05-20More rigorous Fuel environment checkPeter Barabas1-2/+4
get_env() used to raise an unhandled exception when reap.py was run on a Fuel node which didn't yet have an environment set up. Change-Id: I07c37db2d80e416d26fa4fb4907f4e438f1c44e5 Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-05-12Remove residual Lab & configuration DEA and DHA from the unprotected Fuel repoJonas Bjurel28-9381/+0
This needs testing!!!! On a follow-up release, this also needs rebasement, the libvirt templates are still in here - they shouldnt, sinse we dont want Lab specific configs in the Fuel repo. NOT VERIFIED DO NOT MERGE Change-Id: I069ced81b886405463f27f37a6ec78e3748b37b7 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2016-05-11Merge "deployment.py: stdout not consumed when deploying changes"Jonas Bjurel1-3/+9
2016-05-10Merge "Reflect new deploy.py options in README"Daniel Smith1-17/+26
2016-05-10Merge "Use US keyboard layout on the console"Daniel Smith14-15/+15
2016-05-09Merge "Fix handling of relative ISO path on the CLI"Stefan Berg1-3/+4
2016-05-09Use US keyboard layout on the consolePeter Barabas14-15/+15
Change-Id: I40942c7181daf5efd1640a03471e91df82548073 Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-05-06Reflect new deploy.py options in READMEPeter Barabas1-17/+26
Change-Id: Id22ae685f324b58d07bd0c5256f3dbf55672776e Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
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-29Merge "Add a dha adapter python file for ZTE hardware."Jonas Bjurel3-1/+53
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-26Merge "configure_environment.py: quote environment name"Michal Skalski1-1/+1
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-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-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-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-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-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-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
2016-03-11Add no_deploy_environment optionNikolas Hermanns3-9/+30
For development reason it is useable to have an option so that everything is done except the deploy of the openstack environment. Change-Id: I1f1b7f9c89ee8c9ceea96353e25a51eee53b955c
2016-03-10Enable merge of the versions struct of a pluginNikolas Hermanns1-3/+40
When the dic of a plugin is not fully merged into the final dea file. When a list contains dicts there is no merge. This commit enables the versions list to be merged. Change-Id: I20ff7bec74f8f71a8cd21010f44715953cd4616d
2016-03-10Get user id without forking a shell.Peter Barabas1-2/+2
Change-Id: I6789b81186b7ede124a838a5b6668ba8326e0c0b Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-03-10Merge "Fix deploy.py return code"Michal Skalski1-2/+4
2016-03-09Merge "[BGPVPN] Correct BGPVPN plugin file"Szilard Cserey1-0/+22