Commit Graph

5 Commits

Author SHA1 Message Date
Colleen Murphy 4d64868882 Don't hardcode puppet-3-specific config paths
This patch ensures that hiera data and puppet modules, and puppet config
are copied to the right directory depending on the current puppet
version. Since it's possible for the ansible management server and the
managed nodes to have different puppet versions, we need to account for
the possibility that the source and destination paths might be
different. We also don't need to hardcode the various config paths in
config or manage environments since we're using the defaults and
hardcoding them would make them incorrect for one or the other puppet
versions.

Change-Id: I164f91f9a7942e8c5f059652634ec1078ae41aae
2018-04-22 00:13:21 +02:00
James E. Blair 117fd2ed43 Revert "Remove basemodulepath from environment config"
This reverts commit e7a06ed55a.

This caused the ansible apply test to fail (and therefore
potentially puppet runs from our puppetmaster).

Change-Id: I0db01d128258f78e9b196354799a80774f6c6808
2016-10-04 22:36:16 +00:00
Monty Taylor e7a06ed55a
Remove basemodulepath from environment config
We want the env specific modules to be used first then fall back onto
the normal base module path for any modules missing from the
environment. This means you can test local changes without having a
complete set of modules in your env.

Change-Id: I2f0311400a8cf76b9793f50453e818ed4dd7e5a2
2016-10-01 08:11:13 -07:00
Monty Taylor a3cc1c5c9a
Make sure environment winds up in basemodulepath
Change-Id: I7a80158fef3fd764000f7d57a56ebf0df83347ea
2016-10-01 08:11:12 -07:00
Spencer Krum 25cc2c9470 Conditionally manage puppet config files
Allows ansible-puppet to configure settings for
puppet when manage_config flag is set.

Co-Authored-By: Yolanda Robla <info@ysoft.biz>

Change-Id: I6cb8dff569f2cca8bca7359412d01cc7ec009c54
2016-02-05 09:22:47 +01:00