move java config into cluster manifest file, and generated node manif…

…est files
boorad · Dec 5, 2013 · 226eae2 · 226eae2
1 parent d4015af
commit 226eae2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/chef/roles/java.rb b/chef/roles/java.rb
@@ -5,9 +5,5 @@
   "recipe[java::oracle]"
 )
 default_attributes(
-  :java => {
-    :oracle => {
-      "accept_oracle_download_terms" => true
-    }
-  }
+
 )
diff --git a/fabric/manifests.py b/fabric/manifests.py
@@ -11,7 +11,8 @@ def generate():
         n = node["host"]
         print "generating manifests for %s" % n
         m = {'run_list' : run_list(node),
-             'mapr'    : mapr(c, node)}
+             'mapr'     : mapr(c, node),
+             'java'     : java(c)}
         out = open("%s_manifest.json" % n, 'w')
         out.write(json.dumps(m))
         out.close()
@@ -55,6 +56,9 @@ def mapr(c, n):
            'groups'  : groups(c)}
     return ret
 
+def java(c):
+    return c["java"]
+
 def nodes(c):
     ret = []
     for n in c["mapr"]["nodes"]: