This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.6 by this push:
new 350997c AMBARI-24540. Remove duplicate `host_sys_prepped` variable
(#2179)
350997c is described below
commit 350997c663f9f6641ffa97d0f8f122f39ab16592
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Tue Aug 28 22:16:53 2018 +0200
AMBARI-24540. Remove duplicate `host_sys_prepped` variable (#2179)
---
.../resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params.py | 1 +
.../common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py | 2 --
.../src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params.py
index f39d632..f12d931 100644
---
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params.py
+++
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params.py
@@ -37,3 +37,4 @@ host_sys_prepped =
default("/hostLevelParams/host_sys_prepped", False)
sysprep_skip_copy_oozie_share_lib_to_hdfs = False
if host_sys_prepped:
sysprep_skip_copy_oozie_share_lib_to_hdfs =
default("/configurations/cluster-env/sysprep_skip_copy_oozie_share_lib_to_hdfs",
False)
+sysprep_skip_oozie_schema_create = host_sys_prepped and
default("/configurations/cluster-env/sysprep_skip_oozie_schema_create", False)
diff --git
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
index 1c318e8..8f38843 100644
---
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
+++
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
@@ -68,8 +68,6 @@ stack_name_uppercase = stack_name.upper()
upgrade_direction = default("/commandParams/upgrade_direction", None)
agent_stack_retry_on_unavailability =
config['hostLevelParams']['agent_stack_retry_on_unavailability']
agent_stack_retry_count = expect("/hostLevelParams/agent_stack_retry_count",
int)
-host_sys_prepped = default("/hostLevelParams/host_sys_prepped", False)
-sysprep_skip_oozie_schema_create = host_sys_prepped and
default("/configurations/cluster-env/sysprep_skip_oozie_schema_create", False)
stack_root = status_params.stack_root
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
index ed5322a..89cf70d 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
@@ -129,7 +129,7 @@
<name>sysprep_skip_oozie_schema_create</name>
<display-name>Whether to skip creating the Oozie DB schema on sysprepped
cluster</display-name>
<value>false</value>
- <description>Whether to skip creating the Oozie DB schema on sysprepped
cluster, during both fresh install and stack upgrade</description>
+ <description>Whether to skip creating the Oozie DB schema on sysprepped
cluster, during fresh install</description>
<value-attributes>
<overridable>true</overridable>
<type>boolean</type>
