Repository: bigtop Updated Branches: refs/heads/master f76a845ed -> 928c1d550
Added mac support for docker provision Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/872fad02 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/872fad02 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/872fad02 Branch: refs/heads/master Commit: 872fad020254d72500ba3addddbd64c7d081858e Parents: f76a845 Author: David Capwell <[email protected]> Authored: Tue Oct 28 13:56:22 2014 -0700 Committer: Roman Shaposhnik <[email protected]> Committed: Sat Nov 1 15:35:46 2014 -0700 ---------------------------------------------------------------------- bigtop-deploy/vm/docker-puppet/README.md | 6 +++--- bigtop-deploy/vm/docker-puppet/docker-hadoop.sh | 21 ++++++++++---------- 2 files changed, 14 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/872fad02/bigtop-deploy/vm/docker-puppet/README.md ---------------------------------------------------------------------- diff --git a/bigtop-deploy/vm/docker-puppet/README.md b/bigtop-deploy/vm/docker-puppet/README.md index 70f347e..2e8e1e2 100644 --- a/bigtop-deploy/vm/docker-puppet/README.md +++ b/bigtop-deploy/vm/docker-puppet/README.md @@ -35,7 +35,7 @@ This has been verified on docker client 1.2.0, with api version 1.15, and vagran * Install [VirtualBox](https://www.virtualbox.org/wiki/Downloads) -* Install [Vagrant](http://www.vagrantup.com/downloads.html) +* Install [Vagrant](http://www.vagrantup.com/downloads.html). Need version 1.6.5 or higher. ### Linux @@ -57,10 +57,10 @@ ssh into a docker container! ``` service docker restart -docker pull bigtop/seed +docker pull bigtop/seed:centos-6.4 ``` -No, you can start your cluster: +Now, you can start your cluster: ``` cd bigtop/bigtop-deploy/vm/docker-puppet http://git-wip-us.apache.org/repos/asf/bigtop/blob/872fad02/bigtop-deploy/vm/docker-puppet/docker-hadoop.sh ---------------------------------------------------------------------- diff --git a/bigtop-deploy/vm/docker-puppet/docker-hadoop.sh b/bigtop-deploy/vm/docker-puppet/docker-hadoop.sh index 3650c9c..d48815c 100755 --- a/bigtop-deploy/vm/docker-puppet/docker-hadoop.sh +++ b/bigtop-deploy/vm/docker-puppet/docker-hadoop.sh @@ -63,20 +63,21 @@ bigtop-puppet() { } PROG=`basename $0` -ARGS=`getopt -o "bc:psdh" -l "build-image,create:,provision,smoke-tests,destroy,help" -n $PROG -- "$@"` -if [ $? -ne 0 ]; then +if [ $# -eq 0 ]; then usage fi -eval set -- "$ARGS" - -while true; do +while [ $# -gt 0 ]; do case "$1" in -b|--build-image) - build-image + build-image shift;; -c|--create) + if [ $# -lt 2 ]; then + echo "Create requires a number" 1>&2 + usage + fi create $2 shift 2;; -p|--provision) @@ -86,13 +87,13 @@ while true; do smoke-tests shift;; -d|--destroy) - destroy + destroy shift;; -h|--help) usage shift;; - --) - shift - break;; + *) + echo "Unknown argument: '$1'" 1>&2 + usage;; esac done
