diff --git a/manifests/box.pp b/manifests/box.pp index 8f22ec4..58a8a54 100644 --- a/manifests/box.pp +++ b/manifests/box.pp @@ -13,7 +13,7 @@ require vagrant vagrant_box { $name: - ensure => $ensure, - source => $source, + ensure => $ensure, + source => $source, } } diff --git a/manifests/init.pp b/manifests/init.pp index 482fca2..5da1f89 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -15,9 +15,15 @@ default => 'absent', } + if $version >= '1.9.3' { + $pkgurl = "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}_x86_64.dmg" + } else { + $pkgurl = "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}.dmg" + } + package { "Vagrant_${version}": ensure => installed, - source => "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}.dmg", + source => $pkgurl, provider => 'pkgdmg' } @@ -26,11 +32,8 @@ require => Package["Vagrant_${version}"], } - homebrew::tap { 'homebrew/completions': } - package { 'vagrant-completion': ensure => $ensure_pkg, provider => 'homebrew', - require => Homebrew::Tap['homebrew/completions'], } } diff --git a/manifests/plugin.pp b/manifests/plugin.pp index 5663590..48d85af 100644 --- a/manifests/plugin.pp +++ b/manifests/plugin.pp @@ -10,7 +10,7 @@ $ensure = 'present', $force = false, $license = undef, - $version = latest, + $version = present, $prefix = true ) { require vagrant @@ -26,12 +26,12 @@ ensure => $ensure, mode => '0644', source => $license, - replace => $force + replace => $force, } } vagrant_plugin { $plugin_name: ensure => $ensure, - version => $version + version => $version, } }