Repository: ambari Updated Branches: refs/heads/trunk 7772efb45 -> d8f4b1e59
AMBARI-7557 Unable to start Zookeeper with HDP-2.2 (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d8f4b1e5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d8f4b1e5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d8f4b1e5 Branch: refs/heads/trunk Commit: d8f4b1e5908f6810501659489b8ede3372e6c357 Parents: 7772efb Author: Dmytro Sen <d...@hortonworks.com> Authored: Tue Sep 30 17:13:11 2014 +0300 Committer: Dmytro Sen <d...@hortonworks.com> Committed: Tue Sep 30 17:13:11 2014 +0300 ---------------------------------------------------------------------- .../2.0.6/hooks/after-INSTALL/scripts/hook.py | 1 + .../2.0.6/hooks/after-INSTALL/scripts/params.py | 4 +-- .../scripts/shared_initialization.py | 13 +++++---- .../2.0.6/hooks/before-START/scripts/params.py | 4 +-- .../services/FLUME/package/scripts/params.py | 4 +-- .../services/HBASE/package/scripts/params.py | 9 ++---- .../services/HDFS/package/scripts/params.py | 4 +-- .../services/HIVE/package/scripts/params.py | 4 +-- .../services/OOZIE/package/scripts/params.py | 4 +-- .../services/PIG/package/scripts/params.py | 4 +-- .../services/SQOOP/package/scripts/params.py | 4 +-- .../services/YARN/package/scripts/params.py | 4 +-- .../ZOOKEEPER/package/scripts/params.py | 4 +-- .../services/FALCON/package/scripts/params.py | 4 +-- .../services/STORM/package/scripts/params.py | 4 +-- .../HDP/2.2/configuration/cluster-env.xml | 29 ++++++++++++++++++++ .../services/HDFS/configuration/hadoop-env.xml | 29 -------------------- .../services/SLIDER/package/scripts/params.py | 4 +-- ambari-web/app/data/HDP2/site_properties.js | 14 +++++++++- 19 files changed, 79 insertions(+), 68 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d8f4b1e5/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/hook.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/hook.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/hook.py index cf83e19..ea8cdb5 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/hook.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/hook.py @@ -28,6 +28,7 @@ class AfterInstallHook(Hook): import params env.set_params(params) + setup_hdp_install_directory() setup_hadoop_env() setup_config() http://git-wip-us.apache.org/repos/asf/ambari/blob/d8f4b1e5/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/params.py index 7b94817..6e312ca 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/params.py @@ -23,10 +23,10 @@ from resource_management.core.system import System config = Script.get_config() #RPM versioning support -rpm_version = default("/configurations/hadoop-env/rpm_version", None) +rpm_version = default("/configurations/cluster-env/rpm_version", None) #hadoop params -if rpm_version is not None: +if rpm_version: mapreduce_libs_path = "/usr/hdp/current/hadoop-mapreduce/*" hadoop_libexec_dir = "/usr/hdp/current/hadoop/libexec" else: http://git-wip-us.apache.org/repos/asf/ambari/blob/d8f4b1e5/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/shared_initialization.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/shared_initialization.py index 4c633d2..47d01c7 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/shared_initialization.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/shared_initialization.py @@ -19,6 +19,14 @@ limitations under the License. import os from resource_management import * +def setup_hdp_install_directory(): + import params + if params.rpm_version: + Execute(format('ln -s /usr/hdp/{rpm_version}-* {versioned_hdp_root}'), + not_if=format('ls {versioned_hdp_root}'), + only_if=format('ls -d /usr/hdp/{rpm_version}-*') + ) + def setup_hadoop_env(): import params if params.has_namenode: @@ -39,11 +47,6 @@ def setup_hadoop_env(): owner=tc_owner, content=InlineTemplate(params.hadoop_env_sh_template) ) - if params.rpm_version is not None: - Execute(format('ln -s /usr/hdp/{rpm_version}-* {versioned_hdp_root}'), - not_if=format('ls {versioned_hdp_root}'), - only_if=format('ls -d /usr/hdp/{rpm_version}-*') - ) def setup_config(): import params http://git-wip-us.apache.org/repos/asf/ambari/blob/d8f4b1e5/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py index d4ff0d3..0a1a0ef 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py @@ -24,10 +24,10 @@ import os config = Script.get_config() #RPM versioning support -rpm_version = default("/configurations/hadoop-env/rpm_version", None) +rpm_version = default("/configurations/cluster-env/rpm_version", None) #hadoop params -if rpm_version is not None: +if rpm_version: mapreduce_libs_path = "/usr/hdp/current/hadoop-mapreduce/*" hadoop_libexec_dir = "/usr/hdp/current/hadoop/libexec" hadoop_lib_home = "/usr/hdp/current/hadoop/lib" http://git-wip-us.apache.org/repos/asf/ambari/blob/d8f4b1e5/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/package/scripts/params.py index 10389cd..cfb9e58 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/package/scripts/params.py @@ -27,10 +27,10 @@ proxyuser_group = config['configurations']['hadoop-env']['proxyuser_group'] security_enabled = False #RPM versioning support -rpm_version = default("/configurations/hadoop-env/rpm_version", None) +rpm_version = default("/configurations/cluster-env/rpm_version", None) #hadoop params -if rpm_version is not None: +if rpm_version: flume_bin = '/usr/hdp/current/flume/bin/flume-ng' else: flume_bin = '/usr/bin/flume-ng' http://git-wip-us.apache.org/repos/asf/ambari/blob/d8f4b1e5/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py index ed086dc..70c1c9f 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py @@ -27,15 +27,10 @@ config = Script.get_config() exec_tmp_dir = Script.get_tmp_dir() #RPM versioning support -rpm_version = default("/configurations/hadoop-env/rpm_version", None) +rpm_version = default("/configurations/cluster-env/rpm_version", None) #hadoop params -if rpm_version is not None: -#RPM versioning support - rpm_version = default("/configurations/hadoop-env/rpm_version", None) - -#hadoop params -if rpm_version is not None: +if rpm_version: hadoop_bin_dir = format("/usr/hdp/current/hadoop/bin") daemon_script = format('/usr/hdp/current/hbase/bin/hbase-daemon.sh') region_mover = format('/usr/hdp/current/hbase/bin/region_mover.rb') http://git-wip-us.apache.org/repos/asf/ambari/blob/d8f4b1e5/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py index c56fac4..27cef20 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py @@ -25,10 +25,10 @@ config = Script.get_config() tmp_dir = Script.get_tmp_dir() #RPM versioning support -rpm_version = default("/configurations/hadoop-env/rpm_version", None) +rpm_version = default("/configurations/cluster-env/rpm_version", None) #hadoop params -if rpm_version is not None: +if rpm_version: mapreduce_libs_path = "/usr/hdp/current/hadoop-mapreduce/*" hadoop_libexec_dir = "/usr/hdp/current/hadoop/libexec" hadoop_bin = "/usr/hdp/current/hadoop/sbin" http://git-wip-us.apache.org/repos/asf/ambari/blob/d8f4b1e5/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py index 7e75433..8336c52 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py @@ -27,12 +27,12 @@ config = Script.get_config() tmp_dir = Script.get_tmp_dir() #RPM versioning support -rpm_version = default("/configurations/hadoop-env/rpm_version", None) +rpm_version = default("/configurations/cluster-env/rpm_version", None) hdp_stack_version = config['hostLevelParams']['stack_version'] #hadoop params -if rpm_version is not None: +if rpm_version: hadoop_bin_dir = "/usr/hdp/current/hadoop/bin" hadoop_home = '/usr/hdp/current/hadoop' hadoop_streeming_jars = "/usr/hdp/current/hadoop-mapreduce/hadoop-streaming-*.jar" http://git-wip-us.apache.org/repos/asf/ambari/blob/d8f4b1e5/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py index 927c9e0..aeccc75 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py @@ -27,10 +27,10 @@ config = Script.get_config() tmp_dir = Script.get_tmp_dir() #RPM versioning support -rpm_version = default("/configurations/hadoop-env/rpm_version", None) +rpm_version = default("/configurations/cluster-env/rpm_version", None) #hadoop params -if rpm_version is not None: +if rpm_version: hadoop_bin_dir = "/usr/hdp/current/hadoop/bin" hadoop_lib_home = "/usr/hdp/current/hadoop/lib" mapreduce_libs_path = "/usr/hdp/current/hadoop-mapreduce/*" http://git-wip-us.apache.org/repos/asf/ambari/blob/d8f4b1e5/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/package/scripts/params.py index 5d7ae16..0f09946 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/PIG/package/scripts/params.py @@ -26,10 +26,10 @@ config = Script.get_config() tmp_dir = Script.get_tmp_dir() #RPM versioning support -rpm_version = default("/configurations/hadoop-env/rpm_version", None) +rpm_version = default("/configurations/cluster-env/rpm_version", None) #hadoop params -if rpm_version is not None: +if rpm_version: hadoop_bin_dir = "/usr/hdp/current/hadoop/bin" hadoop_home = '/usr/hdp/current/hadoop' pig_bin_dir = '/usr/hdp/current/pig/bin' http://git-wip-us.apache.org/repos/asf/ambari/blob/d8f4b1e5/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/SQOOP/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/SQOOP/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/SQOOP/package/scripts/params.py index ff200b8..b5f57ce 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/SQOOP/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/SQOOP/package/scripts/params.py @@ -22,10 +22,10 @@ from resource_management import * config = Script.get_config() #RPM versioning support -rpm_version = default("/configurations/hadoop-env/rpm_version", None) +rpm_version = default("/configurations/cluster-env/rpm_version", None) #hadoop params -if rpm_version is not None: +if rpm_version: sqoop_conf_dir = '/usr/hdp/current/etc/sqoop/conf' sqoop_lib = '/usr/hdp/current/sqoop/lib' hbase_home = '/usr/hdp/current/hbase' http://git-wip-us.apache.org/repos/asf/ambari/blob/d8f4b1e5/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py index 86eee78..c6f56a0 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py @@ -28,10 +28,10 @@ config = Script.get_config() tmp_dir = Script.get_tmp_dir() #RPM versioning support -rpm_version = default("/configurations/hadoop-env/rpm_version", None) +rpm_version = default("/configurations/cluster-env/rpm_version", None) #hadoop params -if rpm_version is not None: +if rpm_version: hadoop_libexec_dir = "/usr/hdp/current/hadoop/libexec" hadoop_bin = "/usr/hdp/current/hadoop/sbin" hadoop_bin_dir = "/usr/hdp/current/hadoop/bin" http://git-wip-us.apache.org/repos/asf/ambari/blob/d8f4b1e5/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/params.py index b691c3f..89d1089 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/params.py @@ -27,10 +27,10 @@ config = Script.get_config() tmp_dir = Script.get_tmp_dir() #RPM versioning support -rpm_version = default("/configurations/hadoop-env/rpm_version", None) +rpm_version = default("/configurations/cluster-env/rpm_version", None) #hadoop params -if rpm_version is not None: +if rpm_version: zk_bin = '/usr/hdp/current/zookeeper/bin' smoke_script = '/usr/hdp/current/zookeeper/bin/zkCli.sh' else: http://git-wip-us.apache.org/repos/asf/ambari/blob/d8f4b1e5/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/package/scripts/params.py index 30548f1..425544b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/package/scripts/params.py @@ -24,10 +24,10 @@ from status_params import * config = Script.get_config() #RPM versioning support -rpm_version = default("/configurations/hadoop-env/rpm_version", None) +rpm_version = default("/configurations/cluster-env/rpm_version", None) #hadoop params -if rpm_version is not None: +if rpm_version: hadoop_bin_dir = "/usr/hdp/current/hadoop/bin" falcon_webapp_dir = "/usr/hdp/current/falcon/webapp" falcon_home = "/usr/hdp/current/falcon" http://git-wip-us.apache.org/repos/asf/ambari/blob/d8f4b1e5/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/params.py index 4a8ec51..a5750fb 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/params.py @@ -25,10 +25,10 @@ import status_params config = Script.get_config() #RPM versioning support -rpm_version = default("/configurations/hadoop-env/rpm_version", None) +rpm_version = default("/configurations/cluster-env/rpm_version", None) #hadoop params -if rpm_version is not None: +if rpm_version: rest_lib_dir = '/usr/hdp/current/storm/contrib/storm-rest' storm_bin_dir = "/usr/hdp/current/storm/bin" else: http://git-wip-us.apache.org/repos/asf/ambari/blob/d8f4b1e5/ambari-server/src/main/resources/stacks/HDP/2.2/configuration/cluster-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/configuration/cluster-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/configuration/cluster-env.xml new file mode 100644 index 0000000..7370dd2 --- /dev/null +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/configuration/cluster-env.xml @@ -0,0 +1,29 @@ +<?xml version="1.0"?> +<?xml-stylesheet type="text/xsl" href="configuration.xsl"?> +<!-- +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +--> + +<configuration> + <property> + <name>rpm_version</name> + <value>2.2.0.0</value> + <description>Hadoop RPM version</description> + </property> +</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/d8f4b1e5/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml deleted file mode 100644 index 7370dd2..0000000 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0"?> -<?xml-stylesheet type="text/xsl" href="configuration.xsl"?> -<!-- -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ ---> - -<configuration> - <property> - <name>rpm_version</name> - <value>2.2.0.0</value> - <description>Hadoop RPM version</description> - </property> -</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/d8f4b1e5/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/package/scripts/params.py index 394ba12..c791083 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/package/scripts/params.py @@ -24,10 +24,10 @@ from resource_management import * config = Script.get_config() #RPM versioning support -rpm_version = default("/configurations/hadoop-env/rpm_version", None) +rpm_version = default("/configurations/cluster-env/rpm_version", None) #hadoop params -if rpm_version is not None: +if rpm_version: # slider_conf_dir = '/usr/lib/current/slider/conf' # slider_bin_dir = '/usr/lib/current/slider/bin' slider_conf_dir = "/usr/lib/slider/conf" http://git-wip-us.apache.org/repos/asf/ambari/blob/d8f4b1e5/ambari-web/app/data/HDP2/site_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js index d176a92..9886d56 100644 --- a/ambari-web/app/data/HDP2/site_properties.js +++ b/ambari-web/app/data/HDP2/site_properties.js @@ -1818,7 +1818,19 @@ module.exports = "serviceName": "MISC", "filename": "cluster-env.xml" }, - + { + "id": "puppet var", + "name": "rpm_version", + "displayName": "Hadoop RPM version", + "description": "Hadoop RPM version", + "defaultValue": '', + "isRequired": true, + "isOverridable": false, + "isVisible": false, + "isEditable": false, + "serviceName": "MISC", + "filename": "cluster-env.xml" + }, /**********************************************MAPREDUCE2***************************************/ {