BIGTOP-2508. Make Docker Provisioner to work with Docker on Mac Signed-off-by: Olaf Flebbe <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/27efdf52 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/27efdf52 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/27efdf52 Branch: refs/heads/BIGTOP-2253 Commit: 27efdf525551803a8c640b8ea9ebd28d1d8ab70f Parents: af42c2f Author: Evans Ye <[email protected]> Authored: Sun Jul 10 15:33:22 2016 +0800 Committer: Olaf Flebbe <[email protected]> Committed: Thu Aug 4 21:47:17 2016 +0200 ---------------------------------------------------------------------- provisioner/docker/config/hiera.yaml | 1 + provisioner/docker/config/hieradata/PLACEHOLDER | 0 provisioner/docker/config/hosts | 1 + provisioner/docker/docker-hadoop.sh | 4 +++- 4 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/27efdf52/provisioner/docker/config/hiera.yaml ---------------------------------------------------------------------- diff --git a/provisioner/docker/config/hiera.yaml b/provisioner/docker/config/hiera.yaml new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/provisioner/docker/config/hiera.yaml @@ -0,0 +1 @@ + http://git-wip-us.apache.org/repos/asf/bigtop/blob/27efdf52/provisioner/docker/config/hieradata/PLACEHOLDER ---------------------------------------------------------------------- diff --git a/provisioner/docker/config/hieradata/PLACEHOLDER b/provisioner/docker/config/hieradata/PLACEHOLDER new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/bigtop/blob/27efdf52/provisioner/docker/config/hosts ---------------------------------------------------------------------- diff --git a/provisioner/docker/config/hosts b/provisioner/docker/config/hosts new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/provisioner/docker/config/hosts @@ -0,0 +1 @@ + http://git-wip-us.apache.org/repos/asf/bigtop/blob/27efdf52/provisioner/docker/docker-hadoop.sh ---------------------------------------------------------------------- diff --git a/provisioner/docker/docker-hadoop.sh b/provisioner/docker/docker-hadoop.sh index 4b1c0df..9c7794f 100755 --- a/provisioner/docker/docker-hadoop.sh +++ b/provisioner/docker/docker-hadoop.sh @@ -125,7 +125,9 @@ destroy() { docker-compose -p $PROVISION_ID stop docker-compose -p $PROVISION_ID rm -f fi - rm -rvf ./config .provision_id + echo > ./config/hiera.yaml + echo > ./config/hosts + rm -rvf ./config/hieradata/bigtop ./config/hieradata/site.yaml .provision_id } bigtop-puppet() {
