Skip to content

Commit 951f172

Browse files
Allow setting RUBYOPT
Allows me to work around http://projects.puppetlabs.com/issues/22762
1 parent 10eb39f commit 951f172

File tree

4 files changed

+5
-0
lines changed

4 files changed

+5
-0
lines changed

manifests/init.pp

+2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
$plugins = [],
3535
$purge_config = false,
3636
$use_embedded_ruby = false,
37+
$rubyopt = '',
3738
$safe_mode = false,
3839
){
3940

@@ -73,6 +74,7 @@
7374
notify_services => $notify_services,
7475
purge_config => $purge_config,
7576
use_embedded_ruby => $use_embedded_ruby,
77+
rubyopt => $rubyopt,
7678
}
7779

7880
class { 'sensu::rabbitmq':

manifests/package.pp

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
$install_repo = 'true',
1212
$purge_config = 'false',
1313
$use_embedded_ruby = 'true',
14+
$rubyopt = '',
1415
) {
1516

1617
if $install_repo == 'true' or $install_repo == true {

spec/classes/sensu_package_spec.rb

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
it { should create_class('sensu::package') }
88
it { should include_class('sensu::repo') }
99
it { should contain_package('sensu').with_ensure('latest') }
10+
it { should contain_file('sensu').with_path('/etc/default/sensu') }
1011
it { should contain_file('/etc/sensu/handlers').with_ensure('directory').with_require('Package[sensu]') }
1112
it { should contain_file('/etc/sensu/plugins').with_ensure('directory').with_require('Package[sensu]') }
1213
it { should contain_file('/etc/sensu/config.json').with_ensure('absent') }

templates/sensu.erb

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
EMBEDDED_RUBY=<%= @use_embedded_ruby %>
2+
RUBYOPT="<%= @rubyopt %>"
23

0 commit comments

Comments
 (0)