Commit Graph

10 Commits

Author SHA1 Message Date
Colleen Murphy fe5255b56f Fix hieradata path for puppet 4
The datadir symlink points to /opt/system-config, but the private
hieradata actually lies within /opt/system-config/hieradata.

Change-Id: Iefedf1d733701c7abebd5022ca98993c5fcbd8a3
2019-02-03 15:45:20 +01:00
Monty Taylor 24eb60b34d
Reorganize hieradata to match ansible variables
We are already organizing our hiera content basically the same way as
ansible needs for variables to be provided. If we reorganize the
directories slightly (to be coordinated with dirs on puppetmaster)
then we can have a single directory do double-duty.

Change-Id: I6ac90a7439ed8a5d9433d9526f37e44668b360ff
2018-08-02 13:11:29 -05:00
Colleen Murphy f0cd27f060 Add parser = future config option to puppet.conf
Enable testing puppet 3 with the future parser[1] by adding the boolean
parameter 'futureparser' to the role, which will turn on `parser =
future` in puppet.conf if set.

[1] https://docs.puppet.com/puppet/3.8/experiments_future.html

Change-Id: Ia65948ba954457d873758ed08502e844151f5cf5
2018-06-05 22:38:48 +02:00
Clark Boylan 7fbe25598b Fix hieradata lookup paths
This requires we get the magical symlink between hieradata in
/opt/system-config to line up with the actual on disk environment
specific hiera location which differs between puppet 3 and 4.

Change-Id: Id4d7a0af72efddb758d94c6437bb1c331d12f406
2018-04-25 12:25:59 -07:00
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
Yolanda Robla 8255eecc9b Fix hiera paths when configuring puppet
The path to hiera was wrong, as long with the subdirectories

Change-Id: I66873aa63fe6bb4ab68b5be7ae14a06479c5bfbc
2016-02-25 22:39:55 +01: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