Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #85 from galthaus/pull-req-master-8e2c62d3d4

More changes to support non-admin nodes [4/4]
  • Loading branch information...
commit c639e5c3bae8ca716c03f99c9b7ce75273b973df 2 parents be9f723 + 8e2c62d
@galthaus galthaus authored
View
4 crowbar_framework/app/controllers/nova_controller.rb
@@ -17,8 +17,8 @@ class NovaController < BarclampController
def nodes
disk_list = {}
name = params[:id] || params[:name]
- node = NodeObject.find_node_by_name(name)
- node["crowbar"]["disks"].each do | disk, data |
+ node = Node.find_by_name(name)
+ node.cmdb_disks.each do | disk, data |
disk_list[disk] = data["size"] if data["usage"] == "Storage"
end
Rails.logger.info "disk list #{disk_list.inspect}"
View
2  crowbar_framework/app/models/nova_service.rb
@@ -57,7 +57,7 @@ def create_proposal
hash = base.config_hash
# automatically swap to qemu if using VMs for testing (relies on node.virtual to detect VMs)
nodes.each do |n|
- if n.node_object.virtual?
+ if n.virtual?
hash["nova"]["libvirt_type"] = "qemu"
break
end
Please sign in to comment.
Something went wrong with that request. Please try again.