Merge pull request #77 from littleidea/master

use db helper

recipes/nova-setup.rb

@@ -35,43 +35,12 @@ end
 include_recipe "nova::nova-common"
 include_recipe "mysql::client"
 
-if Chef::Config[:solo]
+#creates db and user
-  Chef::Log.warn("This recipe uses search. Chef Solo does not support search.")
+#function defined in osops-utils/libraries
-else
+create_db_and_user("mysql",
-  # Lookup mysql ip address
+                   node["nova"]["db"]["name"],
-  mysql_server = search(:node, "roles:mysql-master AND chef_environment:#{node.chef_environment}")
+                   node["nova"]["db"]["username"],
-  if mysql_server.length > 0
+                   node["nova"]["db"]["password"])
-    Chef::Log.info("nova::nova-common/mysql: using search")
-    db_ip_address = mysql_server[0]['mysql']['bind_address']
-    db_root_password = mysql_server[0]['mysql']['server_root_password']
-  else
-    Chef::Log.info("nova::nova-common/mysql: NOT using search")
-    db_ip_address = node['mysql']['bind_address']
-    db_root_password = node['mysql']['server_root_password']
-  end
-end
-
-connection_info = {:host => db_ip_address, :username => "root", :password => db_root_password}
-mysql_database "create nova database" do
-  connection connection_info
-  database_name node["nova"]["db"]["name"]
-  action :create
-end
-
-mysql_database_user node["nova"]["db"]["username"] do
-  connection connection_info
-  password node["nova"]["db"]["password"]
-  action :create
-end
-
-mysql_database_user node["nova"]["db"]["username"] do
-  connection connection_info
-  password node["nova"]["db"]["password"]
-  database_name node["nova"]["db"]["name"]
-  host '%'
-  privileges ["all"]
-  action :grant
-end
 
 execute "nova-manage db sync" do
   command "nova-manage db sync"