aboutsummaryrefslogtreecommitdiff
path: root/provisioner
diff options
context:
space:
mode:
authorEvans Ye <evansye@apache.org>2017-01-22 23:03:35 +0800
committerOlaf Flebbe <of@oflebbe.de>2017-01-22 18:12:54 +0100
commit11eb2d26f19b26cde7b015330abe6d4579833319 (patch)
tree24cfc9e4c505c284a8f4e50ff9fff72767ddba67 /provisioner
parent4ee8f075f99964d5baf21751f977d54cfab6fb0e (diff)
BIGTOP-2674. docker-hadoop option -C does not work correctly any more
Signed-off-by: Olaf Flebbe <of@oflebbe.de>
Diffstat (limited to 'provisioner')
-rwxr-xr-xprovisioner/docker/docker-hadoop.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/provisioner/docker/docker-hadoop.sh b/provisioner/docker/docker-hadoop.sh
index 34953013..80daf671 100755
--- a/provisioner/docker/docker-hadoop.sh
+++ b/provisioner/docker/docker-hadoop.sh
@@ -43,6 +43,8 @@ create() {
mkdir -p config/hieradata 2> /dev/null
echo > ./config/hiera.yaml
echo > ./config/hosts
+ export DOCKER_IMAGE=$(get-yaml-config docker image)
+ export MEM_LIMIT=$(get-yaml-config docker memory_limit)
# Startup instances
docker-compose -p $PROVISION_ID scale bigtop=$1
@@ -192,8 +194,6 @@ fi
if [ -n "$PROVISION_ID" ]; then
NODES=(`docker-compose -p $PROVISION_ID ps -q`)
fi
-export DOCKER_IMAGE=$(get-yaml-config docker image)
-export MEM_LIMIT=$(get-yaml-config docker memory_limit)
while [ $# -gt 0 ]; do
case "$1" in