Revision 966e1580

b/lib/client/gnt_cluster.py
193 193

  
194 194
  hv_state = dict(opts.hv_state)
195 195

  
196
  # FIXME: remove enabled_storage_types when enabled_disk_templates are
197
  # fully implemented.
196 198
  enabled_storage_types = opts.enabled_storage_types
197 199
  if enabled_storage_types is not None:
198 200
    enabled_storage_types = enabled_storage_types.split(",")
199 201
  else:
200 202
    enabled_storage_types = list(constants.DEFAULT_ENABLED_STORAGE_TYPES)
201 203

  
204
  enabled_disk_templates = opts.enabled_disk_templates
205
  if enabled_disk_templates:
206
    enabled_disk_templates = enabled_disk_templates.split(",")
207
  else:
208
    enabled_disk_templates = list(constants.DEFAULT_ENABLED_DISK_TEMPLATES)
209

  
202 210
  bootstrap.InitCluster(cluster_name=args[0],
203 211
                        secondary_ip=opts.secondary_ip,
204 212
                        vg_name=vg_name,
......
459 467
       utils.CommaJoin(pathutils.ES_SEARCH_PATH)),
460 468
      ("enabled storage types",
461 469
       utils.CommaJoin(result["enabled_storage_types"])),
470
      ("enabled disk templates",
471
       utils.CommaJoin(result["enabled_disk_templates"])),
462 472
      ]),
463 473

  
464 474
    ("Default node parameters",
b/src/Ganeti/Query/Server.hs
88 88
  let cluster = configCluster cdata
89 89
      hypervisors = clusterEnabledHypervisors cluster
90 90
      storageTypes = clusterEnabledStorageTypes cluster
91
      diskTemplates = clusterEnabledDiskTemplates cluster
91 92
      def_hv = case hypervisors of
92 93
                 x:_ -> showJSON x
93 94
                 [] -> JSNull
......
140 141
               showJSON $ clusterPreallocWipeDisks cluster)
141 142
            , ("hidden_os", showJSON $ clusterHiddenOs cluster)
142 143
            , ("blacklisted_os", showJSON $ clusterBlacklistedOs cluster)
144
            -- FIXME: remove storage types once enabled disk templates are
145
            -- fully implemented.
143 146
            , ("enabled_storage_types", showJSON storageTypes)
147
            , ("enabled_disk_templates", showJSON diskTemplates)
144 148
            ]
145 149

  
146 150
  in return . Ok . J.makeObj $ obj

Also available in: Unified diff