Rabbitmq plugin fix #577
Merged
Rabbitmq plugin fix #577
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jskarpe
force-pushed
the
rabbitmq_plugin_fix
branch
from
99ba9ea
to
d48d578
Compare
bastelfreak
requested changes
Nov 28, 2016
| @@ -4,7 +4,9 @@ | |||
| on_supported_os.each do |os, facts| | |||
| context "on #{os} " do | |||
| let :facts do | |||
| facts | |||
| facts.merge( | |||
| python_dir: '/usr/local/lib/python2.7/dist-packages' | |||
There was a problem hiding this comment.
can you move the fact to https://github.com/voxpupuli/puppet-collectd/blob/master/spec/default_module_facts.yml?
| @@ -0,0 +1,5 @@ | |||
| Facter.add(:python_dir) do | |||
| setcode do | |||
| Facter::Util::Resolution.exec('python -c "import site; print site.getsitepackages()[0]"') | |||
There was a problem hiding this comment.
This doesn't work on my local machine:
bastelfreak@tmu ~ $ python2 -c "import site; print site.getsitepackages()[0]"
Error processing line 2 of /usr/lib/python2.7/site-packages/zope.app.form-4.0.2-py2.7-nspkg.pth:
Traceback (most recent call last):
File "/usr/lib/python2.7/site.py", line 152, in addpackage
exec line
File "<string>", line 1, in <module>
KeyError: 'zope'
Remainder of file ignored
/usr/lib/python2.7/site-packages
bastelfreak@tmu ~ $ python -c "import site; print site.getsitepackages()[0]"
File "<string>", line 1
import site; print site.getsitepackages()[0]
^
SyntaxError: invalid syntax
bastelfreak@tmu ~ $ python3 -c "import site; print site.getsitepackages()[0]"
File "<string>", line 1
import site; print site.getsitepackages()[0]
^
SyntaxError: invalid syntax
bastelfreak@tmu ~ $
| } | ||
|
|
||
| default: { | ||
| fail("${::osfamily} is not supported.") | ||
| } | ||
| } | ||
|
|
||
| # Override with custom fact value (present only if python is installed) | ||
| $python_dir = pick($::python_dir, $default_python_dir) |
There was a problem hiding this comment.
so this changes the default python directory for at least debian from a collectd specific directory to the distrowide python directory?
There was a problem hiding this comment.
This changes the default python directory to where pip installs the package. Plugin is currently broken, as collectd is configured to look for the package where it doesn't exist (as it's installed using pip)
bastelfreak
approved these changes
Dec 1, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes issue #575