Re: [Puppet Users] Re: Hiera repository + environments + r10k

2016-03-08 Thread Henrik Lindberg
On 08/03/16 15:15, Rudy Gevaert wrote: Just wondering what others have done and what approaches they have taken to solve this issue? Maybe there is some feature of git I am not aware of where I can systematically pick what to merge and what not (although if that was possible I

[Puppet Users] Re: Hiera repository + environments + r10k

2016-03-08 Thread Matthew Ceroni
It actually isn't just hiera data. The Puppetfile becomes an issue. For each environment the branch tag corresponding to that environment is specified for each module. As you merge development to qa and so forth that ends up getting messed up. -- You received this message because you are su

[Puppet Users] Re: Hiera repository + environments + r10k

2016-03-08 Thread Rudy Gevaert
> > > Just wondering what others have done and what approaches they have taken > to solve this issue? Maybe there is some feature of git I am not aware of > where I can systematically pick what to merge and what not (although if > that was possible I can see it being very confusing). > > > Hi