Thanks guys, very interesting. I guess the main thing I'm concerned about with my workflow is that I'll be doing a lot of merging, and I'm not sure how sustainable that is. For example:
1. Add new feature to unstable 2. Merge to dev 3. Merge to testing 4. Merge to production The idea being that once I've done step 4, all four branches will be identical. Between each step I'll be doing extensive testing. I'm also a bit worried about how I'm sacrificing agility with this workflow, unless I'm confident enough with a change that I'll merge dev/testing/ production with unstable in one go. On May 29, 12:48 pm, Carlos Rico <crico.a...@gmail.com> wrote: > We work only with one Git repository for Puppet, and it contains: > - 1 directory for hiera-data -> structured environments. For instance: > > hiera-data > |--common > | |- us > |--master > | |- us > |--production > (etc) > > - 1 directory for all nodes, and 1 manifests file (xx.pp) for each node type > > - And the rest of Puppet modules > > Carlos. > > El lunes, 28 de mayo de 2012 15:14:54 UTC+2, Andy Taylor escribió: > > > > > > > > > > > I'm currently trying to work out the best way structure my Puppet > > environments and VCS structure. At the moment I'mk working on > > something like this: > > > Three Git repositories (one for modules, one for Hiera, one for node > > manifests) > > Multiple branches (each branch representing an environment, e.g. > > production, dev, testing etc.) > > > When changes to modules/Hiera are made, the changes will be made to a > > testing branch, and then merged up the branches until it hits > > production (with the appropriate testing of course). So something like > > this: > > > unstable > dev > testing > production > > > What system do you guys use? Any suggestions about the above workflow? > > > Thanks! > > > Andy > > El lunes, 28 de mayo de 2012 15:14:54 UTC+2, Andy Taylor escribió: > > > > > > > > > > > I'm currently trying to work out the best way structure my Puppet > > environments and VCS structure. At the moment I'mk working on > > something like this: > > > Three Git repositories (one for modules, one for Hiera, one for node > > manifests) > > Multiple branches (each branch representing an environment, e.g. > > production, dev, testing etc.) > > > When changes to modules/Hiera are made, the changes will be made to a > > testing branch, and then merged up the branches until it hits > > production (with the appropriate testing of course). So something like > > this: > > > unstable > dev > testing > production > > > What system do you guys use? Any suggestions about the above workflow? > > > Thanks! > > > Andy -- You received this message because you are subscribed to the Google Groups "Puppet Users" group. To post to this group, send email to puppet-users@googlegroups.com. To unsubscribe from this group, send email to puppet-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/puppet-users?hl=en.
