Repository: ambari Updated Branches: refs/heads/trunk 9d3e6a243 -> f3fe3d232
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/f3fe3d23 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f3fe3d23 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f3fe3d23 Branch: refs/heads/trunk Commit: f3fe3d23208591b524ab69e902d27701195d415b Parents: 9d3e6a2 Author: Siddharth Wagle <swa...@hortonworks.com> Authored: Thu May 8 15:38:28 2014 -0700 Committer: Siddharth Wagle <swa...@hortonworks.com> Committed: Thu May 8 15:38:28 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/f3fe3d23/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/f3fe3d23/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 a9e897e..3c7b035 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/f3fe3d23/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/f3fe3d23/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",
