diff options
| author | Olaf Flebbe <of@oflebbe.de> | 2016-07-23 12:34:12 +0200 |
|---|---|---|
| committer | Olaf Flebbe <of@oflebbe.de> | 2016-08-09 20:26:21 +0200 |
| commit | 40a52870b5a4694ae3af9cf59734a8b2d35675ec (patch) | |
| tree | 0b962e00f1d9cc9480776592c5a1c3df8d9d8509 /provisioner/docker/docker-hadoop.sh | |
| parent | 6591e4bdf1afc7b856ce40a177d225fe03e01579 (diff) | |
BIGTOP-2505: Support systemd containers, fix exec (-e) flag
Diffstat (limited to 'provisioner/docker/docker-hadoop.sh')
| -rwxr-xr-x | provisioner/docker/docker-hadoop.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/provisioner/docker/docker-hadoop.sh b/provisioner/docker/docker-hadoop.sh index 89ac6bbc..4b1c0df5 100755 --- a/provisioner/docker/docker-hadoop.sh +++ b/provisioner/docker/docker-hadoop.sh @@ -41,8 +41,8 @@ create() { PROVISION_ID=`cat .provision_id` # Create a shared /etc/hosts and hiera.yaml that will be both mounted to each container soon mkdir -p config/hieradata 2> /dev/null - cat /dev/null > ./config/hiera.yaml - cat /dev/null > ./config/hosts + echo > ./config/hiera.yaml + echo > ./config/hosts export DOCKER_IMAGE=$(get-yaml-config docker image) # Startup instances @@ -81,8 +81,8 @@ generate-hosts() { generate-config() { echo "Bigtop Puppet configurations are shared between instances, and can be modified under config/hieradata" - cat $BIGTOP_PUPPET_DIR/hiera.yaml > ./config/hiera.yaml - yes | cp -vr $BIGTOP_PUPPET_DIR/hieradata ./config/ + cat $BIGTOP_PUPPET_DIR/hiera.yaml >> ./config/hiera.yaml + cp -vfr $BIGTOP_PUPPET_DIR/hieradata ./config/ cat > ./config/hieradata/site.yaml << EOF bigtop::hadoop_head_node: $1 hadoop::hadoop_storage_dirs: [/data/1, /data/2] @@ -185,7 +185,7 @@ if [ -e .provision_id ]; then PROVISION_ID=`cat .provision_id` fi if [ -n "$PROVISION_ID" ]; then - NODES=`docker-compose -p $PROVISION_ID ps -q` + NODES=(`docker-compose -p $PROVISION_ID ps -q`) fi while [ $# -gt 0 ]; do |