ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pallav...@apache.org
Subject ambari git commit: AMBARI-17672. Zeppelin service: Remove sample notebook downloading shell script (Renjith Kamath via pallavkul)
Date Wed, 13 Jul 2016 06:12:33 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 dd42884fc -> 45f3f1c8d


AMBARI-17672. Zeppelin service: Remove sample notebook downloading shell script (Renjith Kamath
via pallavkul)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/45f3f1c8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/45f3f1c8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/45f3f1c8

Branch: refs/heads/branch-2.4
Commit: 45f3f1c8d17148a793cb85a3f35e129ab7e36320
Parents: dd42884
Author: Pallav Kulshreshtha <pallav.kul@gmail.com>
Authored: Wed Jul 13 11:40:42 2016 +0530
Committer: Pallav Kulshreshtha <pallav.kul@gmail.com>
Committed: Wed Jul 13 11:42:15 2016 +0530

----------------------------------------------------------------------
 .../0.6.0.2.5/package/scripts/master.py         |  6 --
 .../0.6.0.2.5/package/scripts/setup_snapshot.sh | 58 --------------------
 2 files changed, 64 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/45f3f1c8/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
index 54256da..9a77f57 100644
--- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
+++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
@@ -32,8 +32,6 @@ class Master(Script):
   def install(self, env):
     import params
     env.set_params(params)
-
-    Execute('chmod a+x ' + os.path.join(params.service_packagedir, "scripts/setup_snapshot.sh"))
     self.install_packages(env)
 
     # create the pid and zeppelin dirs
@@ -51,10 +49,6 @@ class Master(Script):
     Execute('echo spark_version:' + params.spark_version + ' detected for spark_home: '
             + params.spark_home + ' >> ' + params.zeppelin_log_file, user=params.zeppelin_user)
 
-    # run setup_snapshot.sh
-    Execute(format("{service_packagedir}/scripts/setup_snapshot.sh {zeppelin_dir} {setup_view}
>> {zeppelin_log_file}"),
-            user=params.zeppelin_user)
-
   def create_zeppelin_dir(self, params):
     params.HdfsResource(format("/user/{zeppelin_user}"),
                         type="directory",

http://git-wip-us.apache.org/repos/asf/ambari/blob/45f3f1c8/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/setup_snapshot.sh
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/setup_snapshot.sh
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/setup_snapshot.sh
deleted file mode 100644
index 47a6ed9..0000000
--- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/setup_snapshot.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-
-set -e
-#e.g. /opt/incubator-zeppelin
-export INSTALL_DIR=$1
-
-#if true, will setup Ambari view and import notebooks
-export SETUP_VIEW=$2
-
-
-SETUP_VIEW=`awk '{ print tolower($0) }' <<< "$SETUP_VIEW"`
-echo "SETUP_VIEW is $SETUP_VIEW"
-
-SetupZeppelin () {
-
-  echo "Setting up zeppelin at $INSTALL_DIR"
-  cd $INSTALL_DIR
-
-  if [[ $SETUP_VIEW == "true" ]]
-  then
-    echo "Importing notebooks"
-    mkdir -p notebook
-    cd notebook
-    wget https://codeload.github.com/hortonworks-gallery/zeppelin-notebooks/zip/master -O
notebooks.zip
-    unzip -o notebooks.zip
-
-    if [ -d "zeppelin-notebooks-master" ]; then
-      yes | cp -rf zeppelin-notebooks-master/* .
-      rm -rf zeppelin-notebooks-master
-    fi
-
-    cd ..
-  else
-    echo "Skipping import of sample notebooks"
-  fi
-
-}
-
-SetupZeppelin
-echo "Setup complete"


Mime
View raw message