From 060ff4f8c901c4cd54189f8c075614082eabe1ae Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 3 Mar 2015 10:34:07 +0100 Subject: Vagrant: Install leap_cli from source The develop branch of leap_platform needs leap_cli >= v1.6.3. The leap_cli gem is only 1.6.2, because it needs to work together with the master branch of leap_platform. Therefore we need to install leap_cli from it's develop branch from source. Change-Id: I78b433bfa31ad42f78c49949c757bcfb6cd5c30b --- vagrant/install-platform.pp | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/vagrant/install-platform.pp b/vagrant/install-platform.pp index 30f0b1e6..465ca78a 100755 --- a/vagrant/install-platform.pp +++ b/vagrant/install-platform.pp @@ -11,10 +11,23 @@ file { '/etc/gemrc': content => "---\n:sources:\n - https://rubygems.org/" } -package { 'leap_cli': - ensure => latest, - provider => 'gem', - require => [ Package['ruby1.9.1-dev'], File['/etc/gemrc'] ] +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'] ] } file { [ '/srv/leap', '/srv/leap/configuration', '/var/log/leap' ]: -- cgit v1.2.3