ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From swa...@apache.org
Subject [1/2] git commit: AMBARI-5398. Create default blueprint definitions executable through a script. Fix error logs and other fixes. (swagle)
Date Thu, 08 May 2014 22:36:27 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-1.6.0 a4b308def -> ba1c02b46


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


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/caf42b76
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/caf42b76
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/caf42b76

Branch: refs/heads/branch-1.6.0
Commit: caf42b768df80c9025c38dee5a596255a2493b14
Parents: a4b308d
Author: Siddharth Wagle <swagle@hortonworks.com>
Authored: Thu May 8 15:30:26 2014 -0700
Committer: Siddharth Wagle <swagle@hortonworks.com>
Committed: Thu May 8 15:34:59 2014 -0700

----------------------------------------------------------------------
 ambari-server/src/main/resources/scripts/cluster_blueprint.py | 6 ++++++
 .../stacks/HDP/2.0.6/services/OOZIE/configuration/global.xml  | 1 +
 .../stacks/HDP/2.1/blueprints/multinode-default.json          | 7 +++++++
 .../stacks/HDP/2.1/blueprints/singlenode-default.json         | 7 +++++++
 4 files changed, 21 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/caf42b76/ambari-server/src/main/resources/scripts/cluster_blueprint.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/scripts/cluster_blueprint.py b/ambari-server/src/main/resources/scripts/cluster_blueprint.py
index 5fd422e..e73825d 100644
--- a/ambari-server/src/main/resources/scripts/cluster_blueprint.py
+++ b/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)

http://git-wip-us.apache.org/repos/asf/ambari/blob/caf42b76/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/configuration/global.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/configuration/global.xml
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/configuration/global.xml
index d24d859..b7b865b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/configuration/global.xml
+++ b/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>

http://git-wip-us.apache.org/repos/asf/ambari/blob/caf42b76/ambari-server/src/main/resources/stacks/HDP/2.1/blueprints/multinode-default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/blueprints/multinode-default.json
b/ambari-server/src/main/resources/stacks/HDP/2.1/blueprints/multinode-default.json
index 40b3ead..1069f8e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/blueprints/multinode-default.json
+++ b/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",

http://git-wip-us.apache.org/repos/asf/ambari/blob/caf42b76/ambari-server/src/main/resources/stacks/HDP/2.1/blueprints/singlenode-default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/blueprints/singlenode-default.json
b/ambari-server/src/main/resources/stacks/HDP/2.1/blueprints/singlenode-default.json
index f41b30e..153562b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/blueprints/singlenode-default.json
+++ b/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",


Mime
View raw message