diff --git a/Vagrantfile b/Vagrantfile index cb55336..b247145 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -25,10 +25,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| puppet.facter = { "ssh_username" => "vagrant", "vhost" => config.vm.hostname } puppet.options = ["--verbose", "--debug", "--parser future"] end - - config.ssh.shell = "bash -l" - config.ssh.keep_alive = true - config.ssh.forward_agent = false - config.ssh.forward_x11 = false + config.vagrant.host = :detect end diff --git a/vagrant/manifests/default.pp b/vagrant/manifests/default.pp index 9e3e932..785548b 100644 --- a/vagrant/manifests/default.pp +++ b/vagrant/manifests/default.pp @@ -176,9 +176,8 @@ #Elasticsearch class { 'elasticsearch': manage_repo => true, - repo_version => '1.7', + repo_version => '1.4', java_install => true, - version => '1.7.1' } elasticsearch::instance { 'ongr-01': }