Revert "TMP"

This reverts commit 6c32f3487645619fd273b3cf343a8b7818afb04e.

diff --git a/Vagrantfile b/Vagrantfile
index c166c849406c59c5f22fe8c46601ac9a6f9dcf52..a92c6875ec86db8ec9b12c408d009f42735632ef 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -242,10 +242,6 @@ cat <<EOF >> ${FILE}
 EOF
 SCRIPT
 
-PREPARE_SSH_SCRIPT = <<SCRIPT
-echo host_shell ...
-SCRIPT
-
 #
 # The vagrant machine definitions
 #
@@ -253,7 +249,6 @@ SCRIPT
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   config.vm.synced_folder ".", "/vagrant", disabled: true
-  config.vm.synced_folder "conf", "/vagrant-conf"
 
   #if Vagrant.has_plugin?("vagrant-cachier")
   #  config.cache.scope = :machine
@@ -272,8 +267,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # just let one node do the probing
   probing = false
 
-  preparing_ssh = false
-
   vms.each do |machine|
     config.vm.define machine[:hostname] do |node|
       node.vm.box = machine[:provider][:libvirt][:box]
@@ -328,17 +321,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       ###  s.args = [ '/gluster/gv0', '/gluster/gv1' ]
       ###end
 
-      #
-      # prepare password-less ssh between the nodes for root 
-      #
-      if !preparing_ssh
-        preparing_ssh = true
-        node.vm.provision :host_shell do |host_shell|
-          host_shell.inline = PREPARE_SSH_SCRIPT
-        end
-      end
-
-
       # multiple privisioners with same name possible?
       node.vm.provision "xfs_0", type: "shell" do |s|
         s.path = "provision/shell/gluster/create-brick.sh"