Repository: bigtop Updated Branches: refs/heads/master e665d55d9 -> 9b064eb2a
BIGTOP-1732. remove has_ssh in Docker provisioner Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/9b064eb2 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/9b064eb2 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/9b064eb2 Branch: refs/heads/master Commit: 9b064eb2ad5681d3cd854fa7c16a3f81e0a4c2ac Parents: e665d55 Author: Evans Ye <[email protected]> Authored: Sun Mar 8 05:40:19 2015 +0000 Committer: Evans Ye <[email protected]> Committed: Sun Mar 8 15:26:07 2015 +0000 ---------------------------------------------------------------------- bigtop-deploy/vm/vagrant-puppet-docker/Vagrantfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/9b064eb2/bigtop-deploy/vm/vagrant-puppet-docker/Vagrantfile ---------------------------------------------------------------------- diff --git a/bigtop-deploy/vm/vagrant-puppet-docker/Vagrantfile b/bigtop-deploy/vm/vagrant-puppet-docker/Vagrantfile index f082142..cc910b8 100755 --- a/bigtop-deploy/vm/vagrant-puppet-docker/Vagrantfile +++ b/bigtop-deploy/vm/vagrant-puppet-docker/Vagrantfile @@ -47,7 +47,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| d.build_args = ["-t",CONF["docker"]["image"]] d.vagrant_machine = "boot2docker" d.vagrant_vagrantfile = "./boot2docker/Vagrantfile" - d.has_ssh = true + d.has_ssh = false # We have decided to pipe commands to docker instead of ssh, due to ssh hang issue in vagrant. end image.ssh.username = "root" image.ssh.port = 22 @@ -65,7 +65,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| end d.vagrant_machine = "boot2docker" d.vagrant_vagrantfile = "./boot2docker/Vagrantfile" - d.has_ssh = true + d.has_ssh = false # We have decided to pipe commands to docker instead of ssh, due to ssh hang issue in vagrant. end bigtop.ssh.username = "root" bigtop.ssh.port = 22
