Browse files

Merge pull request #52 from galthaus/pull-req-master-e4517a40898eab08…

…7212433a7dea764948978fc6

sets of changes and unit tests that seem to get nova running somewhat [5/6]
  • Loading branch information...
2 parents ec5fb4f + 88b4256 commit 320c2a828d0b74fe3afa9cdd062febf1f57ad7c0 Rob Hirschfeld committed Dec 31, 2012
Showing with 5 additions and 5 deletions.
  1. +5 −5 crowbar_framework/app/models/keystone_service.rb
View
10 crowbar_framework/app/models/keystone_service.rb
@@ -19,7 +19,7 @@ def proposal_dependencies(prop_config)
answer = []
hash = prop_config.config_hash
if hash["keystone"]["sql_engine"] == "mysql"
- answer << { "barclamp" => "mysql", "inst" => hash["mysql_instance"] }
+ answer << { "barclamp" => "mysql", "inst" => hash["keystone"]["mysql_instance"] }
end
answer
end
@@ -30,10 +30,10 @@ def create_proposal(name)
nodes = Node.all
nodes.delete_if { |n| n.nil? or n.is_admin? }
if nodes.size >= 1
- add_role_to_instance_and_node(n[0].name, base.name, "keystone-server")
+ add_role_to_instance_and_node(nodes[0].name, base.name, "keystone-server")
end
- hash = base.config_hash
+ hash = base.current_config.config_hash
hash["keystone"]["mysql_instance"] = ""
begin
mysql = Barclamp.find_by_name("mysql")
@@ -52,9 +52,9 @@ def create_proposal(name)
hash["keystone"]["sql_engine"] = "mysql"
end
- hash["keystone"][:service][:token] = '%012d' % rand(1e12)
+ hash["keystone"]["service"]["token"] = '%012d' % rand(1e12)
- base.config_hash = hash
+ base.current_config.config_hash = hash
base
end

0 comments on commit 320c2a8

Please sign in to comment.