You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by kw...@apache.org on 2018/03/25 13:33:29 UTC
bigtop git commit: BIGTOP-3014: juju: use charm-env for shebangs
Repository: bigtop
Updated Branches:
refs/heads/master 2b3331fb5 -> e9d3e3b9e
BIGTOP-3014: juju: use charm-env for shebangs
Fixes #349
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/e9d3e3b9
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/e9d3e3b9
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/e9d3e3b9
Branch: refs/heads/master
Commit: e9d3e3b9e9f5d702e89b21d267b9eeff53c5db8a
Parents: 2b3331f
Author: Kevin W Monroe <ke...@canonical.com>
Authored: Fri Mar 9 18:26:52 2018 -0600
Committer: Kevin W Monroe <ke...@canonical.com>
Committed: Sun Mar 25 08:32:21 2018 -0500
----------------------------------------------------------------------
.../hadoop/layer-hadoop-namenode/actions/smoke-test | 2 +-
.../hadoop/layer-hadoop-plugin/actions/smoke-test | 2 +-
.../layer-hadoop-resourcemanager/actions/mrbench | 2 +-
.../layer-hadoop-resourcemanager/actions/nnbench | 2 +-
.../actions/parseBenchmark.py | 2 +-
.../layer-hadoop-resourcemanager/actions/smoke-test | 2 +-
.../layer-hadoop-resourcemanager/actions/teragen | 2 +-
.../layer-hadoop-resourcemanager/actions/terasort | 2 +-
.../layer-hadoop-resourcemanager/actions/testdfsio | 2 +-
.../charm/hadoop/layer-hadoop-slave/actions/smoke-test | 9 ++++-----
.../src/charm/hbase/layer-hbase/actions/perf-test | 2 +-
.../src/charm/hbase/layer-hbase/actions/restart | 9 ++++-----
.../src/charm/hbase/layer-hbase/actions/smoke-test | 2 +-
.../src/charm/hbase/layer-hbase/actions/start | 9 ++++-----
.../charm/hbase/layer-hbase/actions/start-hbase-master | 2 +-
.../hbase/layer-hbase/actions/start-hbase-regionserver | 2 +-
.../src/charm/hbase/layer-hbase/actions/stop | 9 ++++-----
.../charm/hbase/layer-hbase/actions/stop-hbase-master | 2 +-
.../hbase/layer-hbase/actions/stop-hbase-regionserver | 2 +-
.../src/charm/hive/layer-hive/actions/restart | 9 ++++-----
.../src/charm/hive/layer-hive/actions/smoke-test | 9 ++++-----
.../src/charm/kafka/layer-kafka/actions/create-topic | 2 +-
.../src/charm/kafka/layer-kafka/actions/list-topics | 2 +-
.../src/charm/kafka/layer-kafka/actions/list-zks | 2 +-
.../src/charm/kafka/layer-kafka/actions/read-topic | 12 +++++-------
.../src/charm/kafka/layer-kafka/actions/smoke-test | 2 +-
.../src/charm/kafka/layer-kafka/actions/write-topic | 12 +++++-------
.../src/charm/mahout/layer-mahout/actions/smoke-test | 2 +-
.../src/charm/pig/layer-pig/actions/smoke-test | 13 ++++++-------
.../src/charm/spark/layer-spark/actions/list-jobs | 3 ++-
.../src/charm/spark/layer-spark/actions/pagerank | 3 ++-
.../src/charm/spark/layer-spark/actions/reinstall | 2 +-
.../src/charm/spark/layer-spark/actions/remove-job | 3 ++-
.../actions/restart-spark-job-history-server | 3 ++-
.../src/charm/spark/layer-spark/actions/spark-submit | 3 ++-
.../src/charm/spark/layer-spark/actions/sparkbench | 3 ++-
.../src/charm/spark/layer-spark/actions/sparkpi | 3 ++-
.../layer-spark/actions/start-spark-job-history-server | 3 ++-
.../layer-spark/actions/stop-spark-job-history-server | 3 ++-
.../charm/zeppelin/layer-zeppelin/actions/reinstall | 9 ++++-----
.../src/charm/zeppelin/layer-zeppelin/actions/restart | 9 ++++-----
.../charm/zeppelin/layer-zeppelin/actions/smoke-test | 2 +-
.../charm/zookeeper/layer-zookeeper/actions/restart | 9 ++++-----
.../charm/zookeeper/layer-zookeeper/actions/smoke-test | 9 ++++-----
44 files changed, 96 insertions(+), 102 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/actions/smoke-test
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/actions/smoke-test b/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/actions/smoke-test
index 391b626..5cd285f 100755
--- a/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/actions/smoke-test
+++ b/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/actions/smoke-test
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/local/sbin/charm-env python3
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/hadoop/layer-hadoop-plugin/actions/smoke-test
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/hadoop/layer-hadoop-plugin/actions/smoke-test b/bigtop-packages/src/charm/hadoop/layer-hadoop-plugin/actions/smoke-test
index 65ba07c..ac19d85 100755
--- a/bigtop-packages/src/charm/hadoop/layer-hadoop-plugin/actions/smoke-test
+++ b/bigtop-packages/src/charm/hadoop/layer-hadoop-plugin/actions/smoke-test
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/local/sbin/charm-env python3
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/actions/mrbench
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/actions/mrbench b/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/actions/mrbench
index 2b97413..94d3e37 100755
--- a/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/actions/mrbench
+++ b/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/actions/mrbench
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/local/sbin/charm-env bash
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/actions/nnbench
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/actions/nnbench b/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/actions/nnbench
index 64bb230..bb0240c 100755
--- a/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/actions/nnbench
+++ b/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/actions/nnbench
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/local/sbin/charm-env bash
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/actions/parseBenchmark.py
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/actions/parseBenchmark.py b/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/actions/parseBenchmark.py
index 2232aa5..04c9ff4 100755
--- a/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/actions/parseBenchmark.py
+++ b/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/actions/parseBenchmark.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/local/sbin/charm-env python3
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/actions/smoke-test
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/actions/smoke-test b/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/actions/smoke-test
index 34f160b..4d2d434 100755
--- a/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/actions/smoke-test
+++ b/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/actions/smoke-test
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/local/sbin/charm-env python3
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/actions/teragen
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/actions/teragen b/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/actions/teragen
index 95a65e2..ef57f14 100755
--- a/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/actions/teragen
+++ b/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/actions/teragen
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/local/sbin/charm-env bash
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/actions/terasort
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/actions/terasort b/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/actions/terasort
index 2611318..8df3056 100755
--- a/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/actions/terasort
+++ b/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/actions/terasort
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/local/sbin/charm-env bash
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/actions/testdfsio
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/actions/testdfsio b/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/actions/testdfsio
index a53ccac..4246c35 100755
--- a/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/actions/testdfsio
+++ b/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/actions/testdfsio
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/local/sbin/charm-env bash
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/hadoop/layer-hadoop-slave/actions/smoke-test
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/hadoop/layer-hadoop-slave/actions/smoke-test b/bigtop-packages/src/charm/hadoop/layer-hadoop-slave/actions/smoke-test
index f1bb34d..699bafc 100755
--- a/bigtop-packages/src/charm/hadoop/layer-hadoop-slave/actions/smoke-test
+++ b/bigtop-packages/src/charm/hadoop/layer-hadoop-slave/actions/smoke-test
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/local/sbin/charm-env python3
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -16,11 +16,10 @@
# limitations under the License.
import sys
-sys.path.append('lib')
-from charmhelpers.core import hookenv # noqa: E402
-from charms.layer.apache_bigtop_base import Bigtop # noqa: E402
-from charms.reactive import is_state # noqa: E402
+from charmhelpers.core import hookenv
+from charms.layer.apache_bigtop_base import Bigtop
+from charms.reactive import is_state
def fail(msg):
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/hbase/layer-hbase/actions/perf-test
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/hbase/layer-hbase/actions/perf-test b/bigtop-packages/src/charm/hbase/layer-hbase/actions/perf-test
index 215e0dc..415dd4d 100755
--- a/bigtop-packages/src/charm/hbase/layer-hbase/actions/perf-test
+++ b/bigtop-packages/src/charm/hbase/layer-hbase/actions/perf-test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/local/sbin/charm-env bash
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/hbase/layer-hbase/actions/restart
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/hbase/layer-hbase/actions/restart b/bigtop-packages/src/charm/hbase/layer-hbase/actions/restart
index 9ce0a62..f72986d 100755
--- a/bigtop-packages/src/charm/hbase/layer-hbase/actions/restart
+++ b/bigtop-packages/src/charm/hbase/layer-hbase/actions/restart
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/local/sbin/charm-env python3
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -16,11 +16,10 @@
# limitations under the License.
import sys
-sys.path.append('lib')
-from charmhelpers.core import hookenv # noqa: E402
-from charms.reactive import is_state # noqa: E402
-from charms.layer.bigtop_hbase import HBase # noqa: E402
+from charmhelpers.core import hookenv
+from charms.reactive import is_state
+from charms.layer.bigtop_hbase import HBase
def fail(msg):
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/hbase/layer-hbase/actions/smoke-test
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/hbase/layer-hbase/actions/smoke-test b/bigtop-packages/src/charm/hbase/layer-hbase/actions/smoke-test
index 652b706..be71fe1 100755
--- a/bigtop-packages/src/charm/hbase/layer-hbase/actions/smoke-test
+++ b/bigtop-packages/src/charm/hbase/layer-hbase/actions/smoke-test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/local/sbin/charm-env bash
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/hbase/layer-hbase/actions/start
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/hbase/layer-hbase/actions/start b/bigtop-packages/src/charm/hbase/layer-hbase/actions/start
index 9a5a473..023f5ac 100755
--- a/bigtop-packages/src/charm/hbase/layer-hbase/actions/start
+++ b/bigtop-packages/src/charm/hbase/layer-hbase/actions/start
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/local/sbin/charm-env python3
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -16,11 +16,10 @@
# limitations under the License.
import sys
-sys.path.append('lib')
-from charmhelpers.core import hookenv # noqa: E402
-from charms.reactive import is_state # noqa: E402
-from charms.layer.bigtop_hbase import HBase # noqa: E402
+from charmhelpers.core import hookenv
+from charms.reactive import is_state
+from charms.layer.bigtop_hbase import HBase
def fail(msg):
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/hbase/layer-hbase/actions/start-hbase-master
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/hbase/layer-hbase/actions/start-hbase-master b/bigtop-packages/src/charm/hbase/layer-hbase/actions/start-hbase-master
index 13bc1bc..bb63039 100755
--- a/bigtop-packages/src/charm/hbase/layer-hbase/actions/start-hbase-master
+++ b/bigtop-packages/src/charm/hbase/layer-hbase/actions/start-hbase-master
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/local/sbin/charm-env python3
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/hbase/layer-hbase/actions/start-hbase-regionserver
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/hbase/layer-hbase/actions/start-hbase-regionserver b/bigtop-packages/src/charm/hbase/layer-hbase/actions/start-hbase-regionserver
index b7c01a7..12691db 100755
--- a/bigtop-packages/src/charm/hbase/layer-hbase/actions/start-hbase-regionserver
+++ b/bigtop-packages/src/charm/hbase/layer-hbase/actions/start-hbase-regionserver
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/local/sbin/charm-env python3
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/hbase/layer-hbase/actions/stop
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/hbase/layer-hbase/actions/stop b/bigtop-packages/src/charm/hbase/layer-hbase/actions/stop
index 8bdbad6..0db1a5d 100755
--- a/bigtop-packages/src/charm/hbase/layer-hbase/actions/stop
+++ b/bigtop-packages/src/charm/hbase/layer-hbase/actions/stop
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/local/sbin/charm-env python3
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -16,11 +16,10 @@
# limitations under the License.
import sys
-sys.path.append('lib')
-from charmhelpers.core import hookenv # noqa: E402
-from charms.reactive import is_state # noqa: E402
-from charms.layer.bigtop_hbase import HBase # noqa: E402
+from charmhelpers.core import hookenv
+from charms.reactive import is_state
+from charms.layer.bigtop_hbase import HBase
def fail(msg):
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/hbase/layer-hbase/actions/stop-hbase-master
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/hbase/layer-hbase/actions/stop-hbase-master b/bigtop-packages/src/charm/hbase/layer-hbase/actions/stop-hbase-master
index 0279089..ed0c906 100755
--- a/bigtop-packages/src/charm/hbase/layer-hbase/actions/stop-hbase-master
+++ b/bigtop-packages/src/charm/hbase/layer-hbase/actions/stop-hbase-master
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/local/sbin/charm-env python3
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/hbase/layer-hbase/actions/stop-hbase-regionserver
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/hbase/layer-hbase/actions/stop-hbase-regionserver b/bigtop-packages/src/charm/hbase/layer-hbase/actions/stop-hbase-regionserver
index 862770f..793d56a 100755
--- a/bigtop-packages/src/charm/hbase/layer-hbase/actions/stop-hbase-regionserver
+++ b/bigtop-packages/src/charm/hbase/layer-hbase/actions/stop-hbase-regionserver
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/local/sbin/charm-env python3
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/hive/layer-hive/actions/restart
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/hive/layer-hive/actions/restart b/bigtop-packages/src/charm/hive/layer-hive/actions/restart
index 904614f..b8b9c76 100755
--- a/bigtop-packages/src/charm/hive/layer-hive/actions/restart
+++ b/bigtop-packages/src/charm/hive/layer-hive/actions/restart
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/local/sbin/charm-env python3
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -16,11 +16,10 @@
# limitations under the License.
import sys
-sys.path.append('lib')
-from charmhelpers.core import hookenv # noqa: E402
-from charms.layer.bigtop_hive import Hive # noqa: E402
-from charms.reactive import is_state # noqa: E402
+from charmhelpers.core import hookenv
+from charms.layer.bigtop_hive import Hive
+from charms.reactive import is_state
def fail(msg):
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/hive/layer-hive/actions/smoke-test
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/hive/layer-hive/actions/smoke-test b/bigtop-packages/src/charm/hive/layer-hive/actions/smoke-test
index d6ac244..ee50f17 100755
--- a/bigtop-packages/src/charm/hive/layer-hive/actions/smoke-test
+++ b/bigtop-packages/src/charm/hive/layer-hive/actions/smoke-test
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/local/sbin/charm-env python3
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -16,11 +16,10 @@
# limitations under the License.
import sys
-sys.path.append('lib')
-from charmhelpers.core import hookenv # noqa: E402
-from charms.layer.apache_bigtop_base import Bigtop # noqa: E402
-from charms.reactive import is_state # noqa: E402
+from charmhelpers.core import hookenv
+from charms.layer.apache_bigtop_base import Bigtop
+from charms.reactive import is_state
def fail(msg):
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/kafka/layer-kafka/actions/create-topic
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/kafka/layer-kafka/actions/create-topic b/bigtop-packages/src/charm/kafka/layer-kafka/actions/create-topic
index 159eac7..b0d6ff2 100755
--- a/bigtop-packages/src/charm/kafka/layer-kafka/actions/create-topic
+++ b/bigtop-packages/src/charm/kafka/layer-kafka/actions/create-topic
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/local/sbin/charm-env python3
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/kafka/layer-kafka/actions/list-topics
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/kafka/layer-kafka/actions/list-topics b/bigtop-packages/src/charm/kafka/layer-kafka/actions/list-topics
index 0241586..4bc42b4 100755
--- a/bigtop-packages/src/charm/kafka/layer-kafka/actions/list-topics
+++ b/bigtop-packages/src/charm/kafka/layer-kafka/actions/list-topics
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/local/sbin/charm-env python3
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/kafka/layer-kafka/actions/list-zks
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/kafka/layer-kafka/actions/list-zks b/bigtop-packages/src/charm/kafka/layer-kafka/actions/list-zks
index be9541a..c06fe23 100755
--- a/bigtop-packages/src/charm/kafka/layer-kafka/actions/list-zks
+++ b/bigtop-packages/src/charm/kafka/layer-kafka/actions/list-zks
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/local/sbin/charm-env python3
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/kafka/layer-kafka/actions/read-topic
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/kafka/layer-kafka/actions/read-topic b/bigtop-packages/src/charm/kafka/layer-kafka/actions/read-topic
index a1053e7..60670d4 100755
--- a/bigtop-packages/src/charm/kafka/layer-kafka/actions/read-topic
+++ b/bigtop-packages/src/charm/kafka/layer-kafka/actions/read-topic
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/local/sbin/charm-env python3
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -17,13 +17,11 @@
import kafkautils
import subprocess
-import sys
-sys.path.append('lib') # Add our helpers to our path.
-from charmhelpers.core import hookenv, host # noqa: E402
-from charms.layer.apache_bigtop_base import get_layer_opts # noqa: E402
-from charms.reactive import is_state # noqa: E402
-from jujubigdata import utils # noqa: E402
+from charmhelpers.core import hookenv, host
+from charms.layer.apache_bigtop_base import get_layer_opts
+from charms.reactive import is_state
+from jujubigdata import utils
if not is_state('kafka.started'):
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/kafka/layer-kafka/actions/smoke-test
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/kafka/layer-kafka/actions/smoke-test b/bigtop-packages/src/charm/kafka/layer-kafka/actions/smoke-test
index a6cd3b6..ab908a8 100755
--- a/bigtop-packages/src/charm/kafka/layer-kafka/actions/smoke-test
+++ b/bigtop-packages/src/charm/kafka/layer-kafka/actions/smoke-test
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/local/sbin/charm-env python3
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/kafka/layer-kafka/actions/write-topic
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/kafka/layer-kafka/actions/write-topic b/bigtop-packages/src/charm/kafka/layer-kafka/actions/write-topic
index 813c541..1356e09 100755
--- a/bigtop-packages/src/charm/kafka/layer-kafka/actions/write-topic
+++ b/bigtop-packages/src/charm/kafka/layer-kafka/actions/write-topic
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/local/sbin/charm-env python3
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -17,13 +17,11 @@
import kafkautils
import subprocess
-import sys
-sys.path.append('lib') # Add our helpers to our path.
-from charmhelpers.core import hookenv, host # noqa: E402
-from charms.layer.apache_bigtop_base import get_layer_opts # noqa: E402
-from charms.reactive import is_state # noqa: E402
-from jujubigdata import utils # noqa: E402
+from charmhelpers.core import hookenv, host
+from charms.layer.apache_bigtop_base import get_layer_opts
+from charms.reactive import is_state
+from jujubigdata import utils
if not is_state('kafka.started'):
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/mahout/layer-mahout/actions/smoke-test
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/mahout/layer-mahout/actions/smoke-test b/bigtop-packages/src/charm/mahout/layer-mahout/actions/smoke-test
index f903da4..c69affd 100755
--- a/bigtop-packages/src/charm/mahout/layer-mahout/actions/smoke-test
+++ b/bigtop-packages/src/charm/mahout/layer-mahout/actions/smoke-test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/local/sbin/charm-env bash
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/pig/layer-pig/actions/smoke-test
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/pig/layer-pig/actions/smoke-test b/bigtop-packages/src/charm/pig/layer-pig/actions/smoke-test
index 87f128d..fc21d4b 100755
--- a/bigtop-packages/src/charm/pig/layer-pig/actions/smoke-test
+++ b/bigtop-packages/src/charm/pig/layer-pig/actions/smoke-test
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/local/sbin/charm-env python3
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -16,13 +16,12 @@
# limitations under the License.
import sys
-sys.path.append('lib')
-from charmhelpers.core import hookenv # noqa: E402
-from charms.layer.apache_bigtop_base import Bigtop # noqa: E402
-from charms.reactive import is_state # noqa: E402
-from jujubigdata.utils import run_as # noqa: E402
-from path import Path # noqa: E402
+from charmhelpers.core import hookenv
+from charms.layer.apache_bigtop_base import Bigtop
+from charms.reactive import is_state
+from jujubigdata.utils import run_as
+from path import Path
def fail(msg):
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/spark/layer-spark/actions/list-jobs
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/spark/layer-spark/actions/list-jobs b/bigtop-packages/src/charm/spark/layer-spark/actions/list-jobs
index 31da9db..2a15baf 100755
--- a/bigtop-packages/src/charm/spark/layer-spark/actions/list-jobs
+++ b/bigtop-packages/src/charm/spark/layer-spark/actions/list-jobs
@@ -1,4 +1,5 @@
-#!/bin/bash
+#!/usr/local/sbin/charm-env 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.
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/spark/layer-spark/actions/pagerank
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/spark/layer-spark/actions/pagerank b/bigtop-packages/src/charm/spark/layer-spark/actions/pagerank
index 30131e2..e516eca 100755
--- a/bigtop-packages/src/charm/spark/layer-spark/actions/pagerank
+++ b/bigtop-packages/src/charm/spark/layer-spark/actions/pagerank
@@ -1,4 +1,5 @@
-#!/usr/bin/env python3
+#!/usr/local/sbin/charm-env python3
+
# 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.
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/spark/layer-spark/actions/reinstall
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/spark/layer-spark/actions/reinstall b/bigtop-packages/src/charm/spark/layer-spark/actions/reinstall
index 9438c55..a0f4be6 100755
--- a/bigtop-packages/src/charm/spark/layer-spark/actions/reinstall
+++ b/bigtop-packages/src/charm/spark/layer-spark/actions/reinstall
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/local/sbin/charm-env python3
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/spark/layer-spark/actions/remove-job
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/spark/layer-spark/actions/remove-job b/bigtop-packages/src/charm/spark/layer-spark/actions/remove-job
index 280ca05..ad49ae4 100755
--- a/bigtop-packages/src/charm/spark/layer-spark/actions/remove-job
+++ b/bigtop-packages/src/charm/spark/layer-spark/actions/remove-job
@@ -1,4 +1,5 @@
-#!/bin/bash
+#!/usr/local/sbin/charm-env 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.
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/spark/layer-spark/actions/restart-spark-job-history-server
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/spark/layer-spark/actions/restart-spark-job-history-server b/bigtop-packages/src/charm/spark/layer-spark/actions/restart-spark-job-history-server
index 331239a..d00ba50 100755
--- a/bigtop-packages/src/charm/spark/layer-spark/actions/restart-spark-job-history-server
+++ b/bigtop-packages/src/charm/spark/layer-spark/actions/restart-spark-job-history-server
@@ -1,4 +1,5 @@
-#!/usr/bin/env python3
+#!/usr/local/sbin/charm-env python3
+
# 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.
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/spark/layer-spark/actions/spark-submit
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/spark/layer-spark/actions/spark-submit b/bigtop-packages/src/charm/spark/layer-spark/actions/spark-submit
index 90bd68e..98694de 100755
--- a/bigtop-packages/src/charm/spark/layer-spark/actions/spark-submit
+++ b/bigtop-packages/src/charm/spark/layer-spark/actions/spark-submit
@@ -1,4 +1,5 @@
-#!/bin/bash
+#!/usr/local/sbin/charm-env 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.
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/spark/layer-spark/actions/sparkbench
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/spark/layer-spark/actions/sparkbench b/bigtop-packages/src/charm/spark/layer-spark/actions/sparkbench
index 3f626e3..595f2b8 100755
--- a/bigtop-packages/src/charm/spark/layer-spark/actions/sparkbench
+++ b/bigtop-packages/src/charm/spark/layer-spark/actions/sparkbench
@@ -1,4 +1,5 @@
-#!/bin/bash
+#!/usr/local/sbin/charm-env 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.
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/spark/layer-spark/actions/sparkpi
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/spark/layer-spark/actions/sparkpi b/bigtop-packages/src/charm/spark/layer-spark/actions/sparkpi
index 93a4f10..c66e0f4 100755
--- a/bigtop-packages/src/charm/spark/layer-spark/actions/sparkpi
+++ b/bigtop-packages/src/charm/spark/layer-spark/actions/sparkpi
@@ -1,4 +1,5 @@
-#!/usr/bin/env python3
+#!/usr/local/sbin/charm-env python3
+
# 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.
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/spark/layer-spark/actions/start-spark-job-history-server
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/spark/layer-spark/actions/start-spark-job-history-server b/bigtop-packages/src/charm/spark/layer-spark/actions/start-spark-job-history-server
index cc218db..5850f49 100755
--- a/bigtop-packages/src/charm/spark/layer-spark/actions/start-spark-job-history-server
+++ b/bigtop-packages/src/charm/spark/layer-spark/actions/start-spark-job-history-server
@@ -1,4 +1,5 @@
-#!/usr/bin/env python3
+#!/usr/local/sbin/charm-env python3
+
# 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.
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/spark/layer-spark/actions/stop-spark-job-history-server
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/spark/layer-spark/actions/stop-spark-job-history-server b/bigtop-packages/src/charm/spark/layer-spark/actions/stop-spark-job-history-server
index 368b1e9..9701b4f 100755
--- a/bigtop-packages/src/charm/spark/layer-spark/actions/stop-spark-job-history-server
+++ b/bigtop-packages/src/charm/spark/layer-spark/actions/stop-spark-job-history-server
@@ -1,4 +1,5 @@
-#!/usr/bin/env python3
+#!/usr/local/sbin/charm-env python3
+
# 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.
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/zeppelin/layer-zeppelin/actions/reinstall
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/zeppelin/layer-zeppelin/actions/reinstall b/bigtop-packages/src/charm/zeppelin/layer-zeppelin/actions/reinstall
index 7ac8e75..817d40e 100755
--- a/bigtop-packages/src/charm/zeppelin/layer-zeppelin/actions/reinstall
+++ b/bigtop-packages/src/charm/zeppelin/layer-zeppelin/actions/reinstall
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/local/sbin/charm-env python3
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -16,11 +16,10 @@
# limitations under the License.
import sys
-sys.path.append('lib')
-from charmhelpers.core import hookenv, unitdata # noqa: E402
-from charms.layer.apache_bigtop_base import Bigtop, get_package_version # noqa: E402
-from charms.reactive import is_state # noqa: E402
+from charmhelpers.core import hookenv, unitdata
+from charms.layer.apache_bigtop_base import Bigtop, get_package_version
+from charms.reactive import is_state
def fail(msg):
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/zeppelin/layer-zeppelin/actions/restart
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/zeppelin/layer-zeppelin/actions/restart b/bigtop-packages/src/charm/zeppelin/layer-zeppelin/actions/restart
index 6e822b4..db47ce7 100755
--- a/bigtop-packages/src/charm/zeppelin/layer-zeppelin/actions/restart
+++ b/bigtop-packages/src/charm/zeppelin/layer-zeppelin/actions/restart
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/local/sbin/charm-env python3
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -16,11 +16,10 @@
# limitations under the License.
import sys
-sys.path.append('lib')
-from charmhelpers.core import hookenv # noqa: E402
-from charms.reactive import is_state # noqa: E402
-from charms.layer.bigtop_zeppelin import Zeppelin # noqa: E402
+from charmhelpers.core import hookenv
+from charms.reactive import is_state
+from charms.layer.bigtop_zeppelin import Zeppelin
def fail(msg):
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/zeppelin/layer-zeppelin/actions/smoke-test
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/zeppelin/layer-zeppelin/actions/smoke-test b/bigtop-packages/src/charm/zeppelin/layer-zeppelin/actions/smoke-test
index e2e5959..55996eb 100755
--- a/bigtop-packages/src/charm/zeppelin/layer-zeppelin/actions/smoke-test
+++ b/bigtop-packages/src/charm/zeppelin/layer-zeppelin/actions/smoke-test
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/local/sbin/charm-env python3
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/zookeeper/layer-zookeeper/actions/restart
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/zookeeper/layer-zookeeper/actions/restart b/bigtop-packages/src/charm/zookeeper/layer-zookeeper/actions/restart
index acbd448..94d6d6a 100755
--- a/bigtop-packages/src/charm/zookeeper/layer-zookeeper/actions/restart
+++ b/bigtop-packages/src/charm/zookeeper/layer-zookeeper/actions/restart
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/local/sbin/charm-env python3
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -16,11 +16,10 @@
# limitations under the License.
import sys
-sys.path.append('lib') # Add our helpers to our path.
-from charmhelpers.core import hookenv # noqa: E402
-from charms.layer.bigtop_zookeeper import Zookeeper # noqa: E402
-from charms.reactive import is_state # noqa: E402
+from charmhelpers.core import hookenv
+from charms.layer.bigtop_zookeeper import Zookeeper
+from charms.reactive import is_state
def main():
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e9d3e3b9/bigtop-packages/src/charm/zookeeper/layer-zookeeper/actions/smoke-test
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/zookeeper/layer-zookeeper/actions/smoke-test b/bigtop-packages/src/charm/zookeeper/layer-zookeeper/actions/smoke-test
index 0f72ca0..09ac9f6 100755
--- a/bigtop-packages/src/charm/zookeeper/layer-zookeeper/actions/smoke-test
+++ b/bigtop-packages/src/charm/zookeeper/layer-zookeeper/actions/smoke-test
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/local/sbin/charm-env python3
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -16,11 +16,10 @@
# limitations under the License.
import sys
-sys.path.append('lib')
-from charmhelpers.core import hookenv # noqa: E402
-from charms.layer.apache_bigtop_base import Bigtop # noqa: E402
-from charms.reactive import is_state # noqa: E402
+from charmhelpers.core import hookenv
+from charms.layer.apache_bigtop_base import Bigtop
+from charms.reactive import is_state
def fail(msg):