Revision 9c8c69bc lib/client/gnt_cluster.py

b/lib/client/gnt_cluster.py
457 457 
      ("OS search path", utils.CommaJoin(pathutils.OS_SEARCH_PATH)),
458 458 
      ("ExtStorage Providers search path",
459 459 
       utils.CommaJoin(pathutils.ES_SEARCH_PATH)),
460 
      ("enabled storage types",
461 
       utils.CommaJoin(result["enabled_storage_types"])),
462 460 
      ("enabled disk templates",
463 461 
       utils.CommaJoin(result["enabled_disk_templates"])),
464 462 
      ]),
......
964 962 
          opts.use_external_mip_script is not None or
965 963 
          opts.prealloc_wipe_disks is not None or
966 964 
          opts.hv_state or
967 
          # FIXME: Remove 'enabled_storage_types' once 'enabled_disk_templates'
968 
          # are fully implemented.
969 
          opts.enabled_storage_types or
970 965 
          opts.enabled_disk_templates or
971 966 
          opts.disk_state or
972 967 
          opts.ispecs_mem_size or
......
1000 995 
  if hvlist is not None:
1001 996 
    hvlist = hvlist.split(",")
1002 997 

  		





  1003
  
  
    
  # FIXME: Remove once 'enabled_disk_templates' are fully implemented.


  		





  1004
  
  
    
  enabled_storage_types = opts.enabled_storage_types


  		





  1005
  
  
    
  if enabled_storage_types is not None:


  		





  1006
  
  
    
    enabled_storage_types = enabled_storage_types.split(",")


  		





  1007
  
  
    

  		





  1008
  998
  
    
  enabled_disk_templates = opts.enabled_disk_templates


  		





  1009
  999
  
    
  if enabled_disk_templates:


  		





  1010
  1000
  
    
    enabled_disk_templates = enabled_disk_templates.split(",")


  		





  ......




  1100
  1090
  
    
    use_external_mip_script=ext_ip_script,


  		





  1101
  1091
  
    
    hv_state=hv_state,


  		





  1102
  1092
  
    
    disk_state=disk_state,


  		





  1103
  
  
    
    # FIXME: remove once 'enabled_disk_templates' are fully implemented.


  		





  1104
  
  
    
    enabled_storage_types=enabled_storage_types,


  		





  1105
  1093
  
    
    enabled_disk_templates=enabled_disk_templates,


  		





  1106
  1094
  
    
    )


  		





  1107
  1095
  
    
  SubmitOrSend(op, opts)


  		





  ......




  1586
  1574
  
    
     DRBD_HELPER_OPT, NODRBD_STORAGE_OPT, DEFAULT_IALLOCATOR_OPT,


  		





  1587
  1575
  
    
     RESERVED_LVS_OPT, DRY_RUN_OPT, PRIORITY_OPT, PREALLOC_WIPE_DISKS_OPT,


  		





  1588
  1576
  
    
     NODE_PARAMS_OPT, USE_EXTERNAL_MIP_SCRIPT, DISK_PARAMS_OPT, HV_STATE_OPT,


  		





  1589
  
  
    
     DISK_STATE_OPT, SUBMIT_OPT, ENABLED_STORAGE_TYPES_OPT,


  		





  1590
  
  
    
     ENABLED_DISK_TEMPLATES_OPT] +


  		





  
  1577
  
    
     DISK_STATE_OPT, SUBMIT_OPT, ENABLED_DISK_TEMPLATES_OPT] +


  		





  1591
  1578
  
    
    INSTANCE_POLICY_OPTS,


  		





  1592
  1579
  
    
    "[opts...]",


  		





  1593
  1580
  
    
    "Alters the parameters of the cluster"),


  		












Also available in:
  Unified diff