Merge pull request #7 from galthaus/pull-req-release-fred-master-86ab…

…effe03 [1/3]
crowbar-archive · Jun 29, 2012 · 709bce3 · 709bce3
2 parents fb3a82d + 86abeff
commit 709bce3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/chef/cookbooks/hive/attributes/hive-site.rb b/chef/cookbooks/hive/attributes/hive-site.rb
@@ -80,4 +80,4 @@
 default[:hive][:javax_jdo_option_ConnectionDriverName] = "org.apache.derby.jdbc.EmbeddedDriver"
 
 # JDBC connect string for a JDBC metastore.
-default[:hive][:javax_jdo_option_ConnectionURL] = "jdbc:derby:;databaseName=metastore_db;create=true"
+default[:hive][:javax_jdo_option_ConnectionURL] = "/var/metastore/metadb"
diff --git a/chef/cookbooks/hive/recipes/default.rb b/chef/cookbooks/hive/recipes/default.rb
@@ -29,12 +29,22 @@
   action :install
 end
 
+service "hiveserver" do
+  supports :start => true, :stop => true, :status => true, :restart => true
+  action :enable
+end
+
 # Setup the hive config file.
 template "/etc/hive/conf/hive-site.xml" do
   owner node[:hive][:process_file_system_owner]
   group node[:hive][:global_file_system_group]
   mode "0644"
   source "hive-site.xml.erb"
+  notifies :restart, resources(:service => "hiveserver")
+end
+
+service "hiveserver" do
+  action  :start
 end
 
 #######################################################################

diff --git a/chef/data_bags/crowbar/bc-template-hive.json b/chef/data_bags/crowbar/bc-template-hive.json
@@ -20,7 +20,7 @@
       "hive_metastore_uris": "file:///var/metastore/metadb/",
       "hive_metastore_warehouse_dir": "/user/hive/warehouse",
       "javax_jdo_option_ConnectionDriverName": "org.apache.derby.jdbc.EmbeddedDriver",
-      "javax_jdo_option_ConnectionURL": "jdbc:derby:;databaseName=metastore_db;create=true"
+      "javax_jdo_option_ConnectionURL": "/var/metastore/metadb"
     }
   },
   "deployment": {