Merge tag '0.8.0'

Release 0.8.0

1 files changed, 7 insertions, 28 deletions

diff --git a/vagrant/install-platform.pp b/vagrant/install-platform.pp
index 465ca78a..223853c1 100755
--- a/vagrant/install-platform.pp
+++ b/vagrant/install-platform.pp
@@ -1,36 +1,15 @@
 class {'apt': }
-File['/etc/apt/preferences'] ->
-  Exec['refresh_apt'] ->
-  Package <| ( title != 'lsb' ) |>
+Exec['update_apt'] -> Package <||>
 
-package { [ 'rsync', 'ruby-hiera-puppet', 'git', 'ruby1.9.1-dev', 'rake', 'jq' ]:
-  ensure => installed
-}
-
-file { '/etc/gemrc':
-  content => "---\n:sources:\n  - https://rubygems.org/"
-}
-
-vcsrepo { '/srv/leap/leap_cli':
-  ensure   => present,
-  force    => true,
-  revision => 'develop',
-  provider => 'git',
-  source   => 'https://leap.se/git/leap_cli.git',
-  owner    => 'root',
-  group    => 'root',
-  notify   => Exec['install_leap_cli'],
-  require  => Package['git']
-}
-
-exec { 'install_leap_cli':
-  command     => '/usr/bin/rake build && /usr/bin/rake install',
-  cwd         => '/srv/leap/leap_cli',
-  refreshonly => true,
-  require     => [ Package['ruby1.9.1-dev'], File['/etc/gemrc'], Package['rake'] ]
+# install leap_cli from source, so it will work with the develop
+# branch of leap_platform
+class { '::leap::cli::install':
+  source  => true,
 }
 
 file { [ '/srv/leap', '/srv/leap/configuration', '/var/log/leap' ]:
   ensure => directory
 }
 
+# install prerequisites for configuring the provider
+include ::git