You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2014/05/09 00:36:27 UTC
[1/2] git commit: AMBARI-5398. Create default blueprint definitions
executable through a script. Fix error logs and other fixes. (swagle)
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 <sw...@hortonworks.com>
Authored: Thu May 8 15:30:26 2014 -0700
Committer: Siddharth Wagle <sw...@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",
[2/2] git commit: AMBARI-5705. Fail to install hive client with
error: Fail: Execution of curl returned 22. Fix typo. (swagle)
Posted by sw...@apache.org.
AMBARI-5705. Fail to install hive client with error: Fail: Execution of curl returned 22. Fix typo. (swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ba1c02b4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ba1c02b4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ba1c02b4
Branch: refs/heads/branch-1.6.0
Commit: ba1c02b463bccd6fd6aa06804bdf7ca81a041be8
Parents: caf42b7
Author: Siddharth Wagle <sw...@hortonworks.com>
Authored: Thu May 8 15:32:39 2014 -0700
Committer: Siddharth Wagle <sw...@hortonworks.com>
Committed: Thu May 8 15:35:00 2014 -0700
----------------------------------------------------------------------
.../2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py | 2 +-
.../stacks/2.0.6/hooks/before-INSTALL/test_before_install.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1c02b4/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py
index d7e952a..0165394 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py
@@ -132,7 +132,7 @@ def setup_java():
if not params.jdk_name:
return
- Execute(format("mkdir -p {artifact_dir} ; '\
+ Execute(format("mkdir -p {artifact_dir} ; \
curl --noproxy {ambari_server_hostname} -kf \
--retry 10 {jdk_location}/{jdk_name} -o {jdk_curl_target}"),
path = ["/bin","/usr/bin/"],
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1c02b4/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py
index db3c6b5..b4eeb7a 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py
@@ -32,7 +32,7 @@ class TestHookBeforeInstall(RMFTestCase):
self.assertResourceCalled('Package', 'curl', )
self.assertResourceCalled('Package', 'net-snmp', )
- self.assertResourceCalled('Execute', "mkdir -p /tmp/HDP-artifacts/ ; ' curl --noproxy c6401.ambari.apache.org -kf --retry 10 http://c6401.ambari.apache.org:8080/resources//jdk-7u45-linux-x64.tar.gz -o /tmp/HDP-artifacts//jdk-7u45-linux-x64.tar.gz",
+ self.assertResourceCalled('Execute', "mkdir -p /tmp/HDP-artifacts/ ; curl --noproxy c6401.ambari.apache.org -kf --retry 10 http://c6401.ambari.apache.org:8080/resources//jdk-7u45-linux-x64.tar.gz -o /tmp/HDP-artifacts//jdk-7u45-linux-x64.tar.gz",
not_if = 'test -e /usr/jdk64/jdk1.7.0_45/bin/java',
path = ['/bin', '/usr/bin/'],
)