You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by db...@apache.org on 2017/06/21 11:12:37 UTC
ambari git commit: AMBARI-21271. Add zeppelin.server.ssl.port in
Zeppelin's setting. (dipayanb)
Repository: ambari
Updated Branches:
refs/heads/trunk 134406a65 -> e7fc3a648
AMBARI-21271. Add zeppelin.server.ssl.port in Zeppelin's setting. (dipayanb)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e7fc3a64
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e7fc3a64
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e7fc3a64
Branch: refs/heads/trunk
Commit: e7fc3a6481a66b7b81afd7c728ace895e1763c3c
Parents: 134406a
Author: Dipayan Bhowmick <di...@gmail.com>
Authored: Wed Jun 21 16:42:20 2017 +0530
Committer: Dipayan Bhowmick <di...@gmail.com>
Committed: Wed Jun 21 16:42:20 2017 +0530
----------------------------------------------------------------------
.../ZEPPELIN/0.6.0.2.5/configuration/zeppelin-config.xml | 7 +++++++
.../main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml | 5 +++++
ambari-server/src/test/python/stacks/2.6/configs/default.json | 3 ++-
3 files changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e7fc3a64/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-config.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-config.xml b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-config.xml
index 85f1859..13d726b 100644
--- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-config.xml
+++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-config.xml
@@ -33,6 +33,13 @@
<on-ambari-upgrade add="true"/>
</property>
<property>
+ <name>zeppelin.server.ssl.port</name>
+ <value>9995</value>
+ <description>Server ssl port. (used when ssl property is set to true)
+ </description>
+ <on-ambari-upgrade add="true"/>
+ </property>
+ <property>
<name>zeppelin.notebook.dir</name>
<value>notebook</value>
<description>notebook persist</description>
http://git-wip-us.apache.org/repos/asf/ambari/blob/e7fc3a64/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
----------------------------------------------------------------------
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 df97727..1cbd78b 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
@@ -26,6 +26,11 @@
<transfer operation="delete" delete-key="shiro_ini_content" />
<transfer operation="delete" delete-key="log4j_properties_content" />
</definition>
+
+ <definition xsi:type="configure" id="hdp_2_6_0_0__set_zeppelin.server.ssl.port">
+ <type>zeppelin-config</type>
+ <set key="zeppelin.server.ssl.port" value="9995"/>
+ </definition>
</changes>
</component>
</service>
http://git-wip-us.apache.org/repos/asf/ambari/blob/e7fc3a64/ambari-server/src/test/python/stacks/2.6/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.6/configs/default.json b/ambari-server/src/test/python/stacks/2.6/configs/default.json
index 2570657..add31d0 100644
--- a/ambari-server/src/test/python/stacks/2.6/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.6/configs/default.json
@@ -334,7 +334,8 @@
"zeppelin_group": "zeppelin"
},
"zeppelin-config": {
- "zeppelin.server.port": "9995",
+ "zeppelin.server.port": "9995",
+ "zeppelin.server.ssl.port": "9995",
"zeppelin.ssl.truststore.password": "change me",
"zeppelin.interpreters": "org.apache.zeppelin.spark.SparkInterpreter,org.apache.zeppelin.spark.PySparkInterpreter,org.apache.zeppelin.spark.SparkSqlInterpreter,org.apache.zeppelin.spark.DepInterpreter,org.apache.zeppelin.markdown.Markdown,org.apache.zeppelin.angular.AngularInterpreter,org.apache.zeppelin.shell.ShellInterpreter,org.apache.zeppelin.jdbc.JDBCInterpreter,org.apache.zeppelin.phoenix.PhoenixInterpreter,org.apache.zeppelin.livy.LivySparkInterpreter,org.apache.zeppelin.livy.LivyPySparkInterpreter,org.apache.zeppelin.livy.LivySparkRInterpreter,org.apache.zeppelin.livy.LivySparkSQLInterpreter",
"zeppelin.interpreter.group.order": "spark,angular,jdbc,livy,md,sh",