This is an automated email from the ASF dual-hosted git repository.
vbrodetskyi 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 d8a20d2 [AMBARI-25189] Enable livy.server.access-control.enabled by
default.(vbrodetskyi) (#2872)
d8a20d2 is described below
commit d8a20d2ec9e609d5a077dfd92d315ed2e93c1f96
Author: vbrodetskyi <[email protected]>
AuthorDate: Mon Mar 18 13:37:32 2019 +0200
[AMBARI-25189] Enable livy.server.access-control.enabled by
default.(vbrodetskyi) (#2872)
---
.../main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml | 8 ++++++++
.../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 11 +++++++++++
.../main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 10 ++++++++++
.../main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml | 8 ++++++++
.../stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 4 ++++
.../main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 4 ++++
6 files changed, 45 insertions(+)
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
index d0f83f2..e5fc98e 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
@@ -189,6 +189,14 @@
</definition>
</changes>
</component>
+ <component name="LIVY2_SERVER">
+ <changes>
+ <definition xsi:type="configure"
id="hdp_2_6_6_0_set_server_access_control">
+ <type>livy2-conf</type>
+ <set key="livy.server.access-control.enabled" value="false"
if-type="livy2-conf" if-key="livy.server.access-control.enabled"
if-key-state="absent"/>
+ </definition>
+ </changes>
+ </component>
</service>
<service name="TEZ">
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
index a780bdc..9882701 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
@@ -115,6 +115,7 @@
<service name="SPARK2">
<component>SPARK2_JOBHISTORYSERVER</component>
<component>SPARK2_THRIFTSERVER</component>
+ <component>LIVY2_SERVER</component>
</service>
<service name="ZEPPELIN">
@@ -698,6 +699,10 @@
<execute-stage service="SPARK2" component="SPARK2_CLIENT" title="Apply
config changes for Spark2 Client log4j">
<task xsi:type="configure" id="hdp_2_5_0_0_spark2_client_log4j"/>
</execute-stage>
+
+ <execute-stage service="SPARK2" component="LIVY2_SERVER" title="Set
config changes for livy2 server">
+ <task xsi:type="configure" id="hdp_2_6_6_0_set_server_access_control"/>
+ </execute-stage>
</group>
<!--
@@ -969,6 +974,7 @@
<service name="SPARK2">
<component>SPARK2_JOBHISTORYSERVER</component>
<component>SPARK2_THRIFTSERVER</component>
+ <component>LIVY2_SERVER</component>
</service>
</group>
@@ -1483,6 +1489,11 @@
<task xsi:type="restart-task"/>
</upgrade>
</component>
+ <component name="LIVY2_SERVER">
+ <upgrade>
+ <task xsi:type="restart-task"/>
+ </upgrade>
+ </component>
<component name="SPARK2_CLIENT">
<upgrade>
<task xsi:type="restart-task"/>
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
index 6f18642..9b18ab3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
@@ -277,6 +277,7 @@
<service name="SPARK2">
<component>SPARK2_JOBHISTORYSERVER</component>
<component>SPARK2_THRIFTSERVER</component>
+ <component>LIVY2_SERVER</component>
</service>
</group>
@@ -965,6 +966,15 @@
<task xsi:type="restart-task" />
</upgrade>
</component>
+ <component name="LIVY2_SERVER">
+ <pre-upgrade>
+ <task xsi:type="configure"
id="hdp_2_6_6_0_set_server_access_control"/>
+ </pre-upgrade>
+ <pre-downgrade />
+ <upgrade>
+ <task xsi:type="restart-task" />
+ </upgrade>
+ </component>
</service>
<service name="ZEPPELIN">
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
index cc2b1bb..a67018d 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
@@ -279,6 +279,14 @@
</definition>
</changes>
</component>
+ <component name="LIVY2_SERVER">
+ <changes>
+ <definition xsi:type="configure"
id="hdp_2_6_6_0_set_server_access_control">
+ <type>livy2-conf</type>
+ <set key="livy.server.access-control.enabled" value="false"
if-type="livy2-conf" if-key="livy.server.access-control.enabled"
if-key-state="absent"/>
+ </definition>
+ </changes>
+ </component>
</service>
<service name="TEZ">
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
index 1f221ab..da87afb 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
@@ -424,6 +424,10 @@
<task xsi:type="configure" id="hdp_2_6_0_0_spark2_thriftserver"/>
</execute-stage>
+ <execute-stage service="SPARK2" component="LIVY2_SERVER" title="Set
config changes for livy2 server">
+ <task xsi:type="configure" id="hdp_2_6_6_0_set_server_access_control"/>
+ </execute-stage>
+
<!-- RANGER -->
<execute-stage service="RANGER" component="RANGER_USERSYNC"
title="Enabling Nested Group Sync for Ranger">
<task xsi:type="server_action"
class="org.apache.ambari.server.serveraction.upgrades.RangerUsersyncConfigCalculation">
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml
index a3c0c9b..f8373b2 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml
@@ -897,6 +897,10 @@
</upgrade>
</component>
<component name="LIVY2_SERVER">
+ <pre-upgrade>
+ <task xsi:type="configure"
id="hdp_2_6_6_0_set_server_access_control"/>
+ </pre-upgrade>
+ <pre-downgrade />
<upgrade>
<task xsi:type="restart-task" />
</upgrade>
