summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-12-23 15:44:47 +0100
committervarac <varacanero@zeromail.org>2015-12-23 15:44:47 +0100
commit14b40366ba6ce03af9b624d27e626bb4ef5b342b (patch)
treea8652991253c2e91c39918db3871ef95ec2d4370 /puppet
parentafdce78e2a1128cf9590df9c1f1623f029cedd55 (diff)
[bug] Fix leap::cli::install on jessie
leap_cli could not get installed from source on jessie
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/leap/manifests/cli/install.pp19
1 files changed, 17 insertions, 2 deletions
diff --git a/puppet/modules/leap/manifests/cli/install.pp b/puppet/modules/leap/manifests/cli/install.pp
index 858bd7da..6a12a4a5 100644
--- a/puppet/modules/leap/manifests/cli/install.pp
+++ b/puppet/modules/leap/manifests/cli/install.pp
@@ -3,7 +3,20 @@ class leap::cli::install ( $source = false ) {
if $source {
# needed for building leap_cli from source
include ::git
- include ::site_config::ruby::dev
+ include ::rubygems
+ include ::site_config::packages::build_essential
+
+ class { '::ruby':
+ install_dev => true
+ }
+
+ class { 'bundler::install': install_method => 'package' }
+
+ Class[Ruby] ->
+ Class[rubygems] ->
+ Class[::site_config::packages::build_essential] ->
+ Class[bundler::install]
+
vcsrepo { '/srv/leap/cli':
ensure => present,
@@ -20,8 +33,10 @@ class leap::cli::install ( $source = false ) {
exec { 'install_leap_cli':
command => '/usr/bin/rake build && /usr/bin/rake install',
cwd => '/srv/leap/cli',
+ user => 'root',
+ environment => 'USER=root',
refreshonly => true,
- require => [ Package['ruby-dev'], File['/etc/gemrc'], Package['rake'] ]
+ require => [ Class[bundler::install] ]
}
}
else {