Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Manage puppet.conf's $modulepath #4

Merged
merged 8 commits into from
Aug 23, 2013
Merged

Conversation

glarizza
Copy link
Contributor

This pull request introduces a $modulepath parameter to the r10k module
so the $modulepath parameter in puppet.conf can be managed. It also introduces
$manage_modulepath as a way to opt-out of having the module manage the $modulepath.

Gary Larizza added 8 commits August 15, 2013 20:36
Previously, the R10k module didn't manage Puppet's Modulepath to point
it to the Modules in the dynamic environments that were created.  That
step needed to be done out-of-band.  This commit adds the ability to
manage both FOSS and PE's $modulepaths via Puppet.conf and the inifile
custom type.
Previously, the module was refactored to allow the modulepath
to be declared using the inifile type. This commit moves
the modulepath to be a parameter that can be passed for
the main r10k class, thus making it tunable for anyone using
the module.
Remove redundant $::is_pe check and clean up variables.
Previously I did a check in the config class for $::is_pe and set
the modulepath that way.  When I refactored, I forgot to remove that
check and pass the $modulepath from the main r10k class.  This commit
fixes that.
Previously, a commit was entered to manage the $modulepath in
puppet.conf.  This commit introduces the ability to choose whether
or not to manage the $modulepath by passing a boolean false value
for the $manage_modulepath parameter to the r10k class. There is
no boolean validation checking for this yet.
Puppet's declarative...until it isn't.  Because Puppet's parser parses
variables from top-to-bottom, variables must be declared before they're referenced,
or else they have an empty/undefined value.  This commit re-orders variables
in the params class to fix potentially undefined variables.
acidprime added a commit that referenced this pull request Aug 23, 2013
Manage puppet.conf's $modulepath
@acidprime acidprime merged commit 1fd7f3f into voxpupuli:master Aug 23, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants