Merge remote branch 'devel-2.1'
* devel-2.1: Update import documentation for the recent changes Add a identify-defaults options for import Fix create/import verification of hvparams objects.Cluster: add method to get hv defaults Reuse NIC information from export Reuse backend parameters from export Reuse disk information from export Reuse hypervisor parameters in import Read disk template from export info CreateInstance: separate the reading of the export Move code from ExpandNames to CheckPrereq CreateInstance: Move some code to CheckArguments Export more instance parameters in instance export Export the nicparams too during instance export Handle errors better for wrong nic_count in export QA: Make sure RAPI credentials are setup on cluster init Conflicts: lib/cmdlib.py (strange conflict, HEAD had no changes) Signed-off-by:Iustin Pop <iustin@google.com> Reviewed-by:
Michael Hanselmann <hansmi@google.com>
No related branches found
No related tags found
Showing
- doc/admin.rst 5 additions, 3 deletionsdoc/admin.rst
- lib/backend.py 15 additions, 2 deletionslib/backend.py
- lib/cli.py 27 additions, 8 deletionslib/cli.py
- lib/cmdlib.py 314 additions, 203 deletionslib/cmdlib.py
- lib/constants.py 2 additions, 0 deletionslib/constants.py
- lib/objects.py 27 additions, 12 deletionslib/objects.py
- lib/opcodes.py 1 addition, 1 deletionlib/opcodes.py
- man/gnt-backup.sgml 47 additions, 22 deletionsman/gnt-backup.sgml
- qa/qa-sample.json 3 additions, 0 deletionsqa/qa-sample.json
- qa/qa_cluster.py 15 additions, 0 deletionsqa/qa_cluster.py
- scripts/gnt-backup 10 additions, 9 deletionsscripts/gnt-backup
- test/ganeti.objects_unittest.py 10 additions, 0 deletionstest/ganeti.objects_unittest.py
Loading
Please register or sign in to comment