浏览代码

AMBARI-5398. Create default blueprint definitions executable through a script. Fix error logs and other fixes. (swagle)

Siddharth Wagle 11 年之前
父节点
当前提交
f3fe3d2320

+ 6 - 0
ambari-server/src/main/resources/scripts/cluster_blueprint.py

@@ -379,6 +379,12 @@ class AmbariBlueprint:
           return retCode
         pass
       pass
+    except urllib2.HTTPError, e:
+      logger.error("POST request failed.")
+      logger.error('HTTPError : %s' % e.read())
+      if e.code == 409:
+        return '409'
+      pass
     except Exception, e:
       logger.error("POST request failed.")
       logger.error(e)

+ 1 - 0
ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/configuration/global.xml

@@ -49,6 +49,7 @@
   <property require-input = "true">
     <name>oozie_metastore_user_passwd</name>
     <value></value>
+    <type>PASSWORD</type>
     <description>Database password to use to connect to the database</description>
   </property>
   <property>

+ 7 - 0
ambari-server/src/main/resources/stacks/HDP/2.1/blueprints/multinode-default.json

@@ -1,4 +1,11 @@
 {
+    "configurations" : [
+        {
+            "global" : {
+                "nagios_contact" : "admin@localhost"
+            }
+        }
+    ],
     "host_groups" : [
         {
             "name" : "master_1",

+ 7 - 0
ambari-server/src/main/resources/stacks/HDP/2.1/blueprints/singlenode-default.json

@@ -1,4 +1,11 @@
 {
+    "configurations" : [
+        {
+            "global" : {
+                "nagios_contact" : "admin@localhost"
+            }
+        }
+    ],
     "host_groups" : [
         {
             "name" : "host_group_1",