puppet-runner 0.0.16 → 0.0.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 7f9f14a4a17bcee8aee166974cb35324b4fac947
4
- data.tar.gz: 2646be5104f8831e5ab00c1a5f4eb02806966cb5
3
+ metadata.gz: 9eca6fb0e04dad6979e8a7fd8053f949c94905a9
4
+ data.tar.gz: a496e227414fdcbe50f3cf98775d851940f92c25
5
5
  SHA512:
6
- metadata.gz: 19434bbcdcbdd7e8d8a2abfb4c9245c38d3b9051a918d6ce83039f58c12c3e1fb3d8c240e952f8078fd208c7d977d66c73b8aa5b7757d20eed88acb8c14136ff
7
- data.tar.gz: 6d511c1d6c2e8f88540c162f7d84f22f2912e5433110fb632fc7e65854399ffe420fb1386e5710bc2e41789906ba180a1cfd79a1ee2abf41f6e2bb154bb845db
6
+ metadata.gz: 124abe27173e89ec9a29e9e0a3f281050d7cb1711b04048b06cccf6cb41b2a913c324089c0101b0e66d90e1c0608e90a08da70e805820b245f4e47075bf2ee9a
7
+ data.tar.gz: adcd78eb76c634d0eb54f644df2fd66847f8891037d20f453ea7f2a6abecbff163469fde2f99ae40dd708839a04623e0e3de49359cbe5de7cb69d3fece06e995
data/bin/puppet-runner CHANGED
@@ -337,7 +337,9 @@ end
337
337
 
338
338
  # start puppet
339
339
  if (options['start'] || options['all']) && !stop_apply
340
- puppet_command = "sudo su -c 'source /usr/local/rvm/scripts/rvm; puppet apply /etc/puppet/manifests/site.pp --confdir=/etc/puppet --verbose --detailed-exitcodes --modulepath /etc/puppet/modules'"
340
+ require 'puppet'
341
+ modulefile_definition = Gem::Version.new(Puppet.version) > Gem::Version.new('4.0.0') ? '--modulepath /etc/puppet/modules' : ''
342
+ puppet_command = "sudo su -c 'source /usr/local/rvm/scripts/rvm; puppet apply /etc/puppet/manifests/site.pp --confdir=/etc/puppet --verbose --detailed-exitcodes #{modulefile_definition}'"
341
343
  to_execute = options["--puppet_apply"] || options["-p"] || puppet_command
342
344
  debug "Running #{to_execute}"
343
345
  `#{to_execute}`
@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4
4
 
5
5
  Gem::Specification.new do |spec|
6
6
  spec.name = "puppet-runner"
7
- spec.version = "0.0.16"
7
+ spec.version = "0.0.17"
8
8
  spec.authors = ["Martin Brehovsky"]
9
9
  spec.email = ["mbrehovsky@adaptavist.com"]
10
10
  spec.summary = %q{Preprocessor for hiera config}
@@ -24,5 +24,6 @@ Gem::Specification.new do |spec|
24
24
  spec.add_dependency 'deep_merge'
25
25
  spec.add_dependency 'facter'
26
26
  spec.add_dependency 'hiera-eyaml'
27
+ spec.add_dependency 'puppet'
27
28
  end
28
29
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: puppet-runner
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.16
4
+ version: 0.0.17
5
5
  platform: ruby
6
6
  authors:
7
7
  - Martin Brehovsky
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-02-10 00:00:00.000000000 Z
11
+ date: 2017-02-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -108,6 +108,20 @@ dependencies:
108
108
  - - ">="
109
109
  - !ruby/object:Gem::Version
110
110
  version: '0'
111
+ - !ruby/object:Gem::Dependency
112
+ name: puppet
113
+ requirement: !ruby/object:Gem::Requirement
114
+ requirements:
115
+ - - ">="
116
+ - !ruby/object:Gem::Version
117
+ version: '0'
118
+ type: :runtime
119
+ prerelease: false
120
+ version_requirements: !ruby/object:Gem::Requirement
121
+ requirements:
122
+ - - ">="
123
+ - !ruby/object:Gem::Version
124
+ version: '0'
111
125
  description: Loads user config and created result hiera config and executes puppet
112
126
  apply with it.
113
127
  email: