What is your workflow to merge puppet control repo (environment) branches?
We use control-repos (Puppetfile, hieradata, roles & profiles) and r10k to manage environment branches.
Our modules are stored independently of the control-repo and is included via the r10k Puppetfile.
When a new module developed and is pushed to its respective repo, the following occurs:
- Create a
featurebranch off control-repo environment branch i.e:
Puppetfileto require the module
- On success, merge to environment branch i.e:
At this point, I'm interested to know how I can ensure the remaining environment branches are updated?
I seem to have hit a few issues in figuring out the best way to do this, so I'm keen to know how others approach introducing changes in to their environments?