summaryrefslogtreecommitdiff
path: root/vagrant/install-platform.pp
diff options
context:
space:
mode:
authorkwadronaut <kwadronaut@leap.se>2015-11-12 10:00:27 +0100
committerkwadronaut <kwadronaut@leap.se>2015-11-12 10:00:27 +0100
commit92cc2b1118e98a4fb086d7c62a140dbfc845f4b0 (patch)
tree92896619c0cf4ace177cecfbdea6cbbbb9bc8419 /vagrant/install-platform.pp
parent81467100826ad95266a4c29b11a2ecef759dd782 (diff)
parent7d0b6b25e49a1ccb70c4f502f7dfc58878b900cc (diff)
Merge remote-tracking branch 'origin/develop' into HEAD
Diffstat (limited to 'vagrant/install-platform.pp')
-rwxr-xr-xvagrant/install-platform.pp32
1 files changed, 10 insertions, 22 deletions
diff --git a/vagrant/install-platform.pp b/vagrant/install-platform.pp
index 465ca78a..5ea834b1 100755
--- a/vagrant/install-platform.pp
+++ b/vagrant/install-platform.pp
@@ -3,34 +3,22 @@ File['/etc/apt/preferences'] ->
Exec['refresh_apt'] ->
Package <| ( title != 'lsb' ) |>
-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']
+if $::lsbdistcodename == 'wheezy' {
+ package { 'ruby-hiera-puppet':
+ ensure => installed
+ }
}
-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