This repository was archived by the owner on Mar 8, 2023. It is now read-only.
backmerge for release 7.0.0 #326
Merged
Conversation
This file contains hidden or 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
… a differnt whisper dir path
Add support for Amazon Linux
sync with remote
`$install_prefix` appears to be unused. It's not referenced anywhere else in this module AFAIK, so let's just remove it.
This module uses lots of variable names postfixed with '_REAL'. Assuming that is a practice you wish to continue, it'd probably be a good idea to remove this lint rule. Disables the following warning: <file> - WARNING: variable contains an uppercase letter on line <linenumber>
Ignore variables with uppercase letters in lint
Allow setting service provider by parameter
This is needed on machines where you have multiple versions of python installed, including RHEL 6.x with python27, and more. Everywhere python is called directly has been replaced with the value of 'gr_python_binary', which defaults to just 'python' (i.e., what it was before).
Add the ability to specify an alternative python binary
…ION in carbon.conf.erb
Fix permissions errors caused by Puppet executing `fix-graphite-race-condition.py` while the database is still owned by root.
Fix permissions error when executing fix-graphite-race-condition.py
Fix line endings in templates directory
support custom LOCAL_DATA_DIR with more than one carbon-cache configured
Prevents an error I encountered which seemed to be caused by Carbon's version of txAMQP already being installed when Puppet tried to install the configured txAMQP version.
…ile source Previously, setting `gr_carbon_source` or `gr_graphite_source` to a URL or local file representing the appropriate pip package, while also setting the coresponding package version to `'present'` would result in Puppet attempting to use names like `graphite_web-present-py2.7.egg-info` when creating symlinks to the packages. This fixes that so that the correct file names are used.
Installing graphite with pip >= 7.0.0 causes it to install to the wrong location unless you pass it the `--no-binary=:all:` option. (See [pip install of 0.9.15 = No $GRAPHITE_ROOT/webapp/graphite exists][1].) As Ubuntu Xenial includes pip 8.1 by default, passing this option is necessary. Note that passing install options to pip [requires Puppet v4.1+][2] so this fix will not work on systems using older versions of Puppet. (Even Ubuntu Xenial only includes Puppet 3.8 in its package repositories, which is unfortunate.) Other workarounds are possible, including [downgrading to pip 6.1.1 before installing Graphite][3], or [installing from a tarball with a name that doesn't include all of the letters of package name][4] but this solution seems like the most straighforward one. [1]: graphite-project/graphite-web#1508 (comment) [2]: puppetlabs/puppet@c2697c6 [3]: #309 (comment) [4]: #309 (comment)
Fixes "The 'pe' requirement is no longer supported by the Forge." error when linting.
Symlink correct target when installing carbon or gweb from a URL or file source
add parameter gr_carbon_log_rotate to allow disabling ENABLE_LOGROTATION in carbon.conf.erb
Ubuntu Xenial Support on Puppet 4.1
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
6 participants
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.
No description provided.