Hi. Is there any advantage of using Git vs SVN when using puppet? What folks here mostly use? Thanks. -- 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+unsubscribe@googlegroups.com. For more options, visit this group at http://groups.google.com/group/puppet-users?hl=en.
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 15/01/10 12:19 AM, SyRenity wrote:> Hi. > > Is there any advantage of using Git vs SVN when using puppet? > > What folks here mostly use?I use Git because: a) It''s distributed and I push lots of manifests around in convoluted ways, and b) It''s simply more powerful around branching, cherry-picking, rebasing, etc, etc. Regards James Turnbull - -- Author of: * Pro Linux System Administration (http://tinyurl.com/linuxadmin) * Pulling Strings with Puppet (http://tinyurl.com/pupbook) * Pro Nagios 2.0 (http://tinyurl.com/pronagios) * Hardening Linux (http://tinyurl.com/hardeninglinux) -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (Darwin) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQEVAwUBS08a/CFa/lDkFHAyAQJRRQgAsHiKfnO3CSNgHTZ3te9uLXuvta3MaWEK 2ZFaryEjQAC/n6s8CVj4WSSsFfUtVppg9vmD87tU4IVBJDf16X4I+7SnRmYRjQL/ tFp3o2/upbATP6qHdsmthjrfnM2C8eWo3bz4VZsVxnLQ6xH/rK9Vz9mxq2InjXFx xXbRIGRFKn6mXrmd8QAv6Uwp9hR1VRxbVsaSV7WSMSq7ThkAPQKMhsyt5FFblJ7t yZSnnnY75MR0G1lrOtLfr8kDW1eAiVSHUZfrp8EUXCOJO3SgKMds8hPAcp+nRvib a1NrIB9iKpxmMG1gWZv6CZnp8W9YWrIIqgfsgLssr91Loho/ZTCIlA==LaLp -----END PGP SIGNATURE----- -- 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+unsubscribe@googlegroups.com. For more options, visit this group at http://groups.google.com/group/puppet-users?hl=en.
Hi.> > I use Git because: > > a) It''s distributed and I push lots of manifests around in > convoluted ways, and > b) It''s simply more powerful around branching, cherry-picking, > rebasing, etc, etc. >Thanks for sharing. How do you achieve centralization of all multiple git repos, in case you have several puppetmasters? Regards. -- 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+unsubscribe@googlegroups.com. For more options, visit this group at http://groups.google.com/group/puppet-users?hl=en.
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 15/01/10 12:30 AM, SyRenity wrote:> > Thanks for sharing. How do you achieve centralization of all multiple > git repos, in case you have several puppetmasters?I don''t - I have one central Git repo with multiple branches matching my environments: $ git branch * master -> which is production staging testing development scrapyard puppetbook puppetbook2 Regards James Turnbull - -- Author of: * Pro Linux System Administration (http://tinyurl.com/linuxadmin) * Pulling Strings with Puppet (http://tinyurl.com/pupbook) * Pro Nagios 2.0 (http://tinyurl.com/pronagios) * Hardening Linux (http://tinyurl.com/hardeninglinux) -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (Darwin) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQEVAwUBS08dyyFa/lDkFHAyAQIHAAf/efuN7GdXpt7nxY7o6UFe6u1jugWk8p85 x0g8XV3mRsMAqCuWWUQ+4bPKAsAd1pwZtzG9Rjx5uiNvrWq3ej6X6wanP0hFr5cr OHhaOGegkVzHsZfWFJsqd0o7Q3wtnvgiWPvMP0qGYiWJ4xjD3DtRPX2MZW67dO6R 91E8bfXgzW8mSko9ZALgm9FfjGPkQwVwGQgHLhVkgiFsxHE3BtH7xkGmUQ93sxAk USYAiO1+z/8fxJYMegd8NnaauOZ9CPqLC/llxo/Isnp5c6GNREi4MuiY1zDVt1Hx bAWAG1zOQXn65C/O8+yct9RAeW/fjPIyBwOga8zgrlfAbpMME+sLfQ==Px32 -----END PGP SIGNATURE----- -- 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+unsubscribe@googlegroups.com. For more options, visit this group at http://groups.google.com/group/puppet-users?hl=en.
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 15/01/10 12:36 AM, James Turnbull wrote:> > On 15/01/10 12:30 AM, SyRenity wrote: > > >> >> Thanks for sharing. How do you achieve centralization of allmultiple>> >> git repos, in case you have several puppetmasters? > > > > I don''t - I have one central Git repo with multiple branches > > matching my environments:I should have been clearer here - I maintain one central git repo and check out branches to multiple puppetmasters.> > $ git branch > > * master -> which is production > > staging > > testing > > development > > scrapyard > > puppetbook > > puppetbook2For example production, staging, testing and development are environments on one master. The Puppet book branches are checked out to another master and the scrapyard has bits and pieces that I use for testing and gets checked out in a few places. Regards James Turnbull - -- Author of: * Pro Linux System Administration (http://tinyurl.com/linuxadmin) * Pulling Strings with Puppet (http://tinyurl.com/pupbook) * Pro Nagios 2.0 (http://tinyurl.com/pronagios) * Hardening Linux (http://tinyurl.com/hardeninglinux) -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (Darwin) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQEVAwUBS08fVSFa/lDkFHAyAQLMrwgAxn79MP67SmGrvkRgbHOGXuLuhC5CcZHk NL51aLgZ6UCzY6+bNfuoo+OmC0yGiVn0mkizQePbL6SWuwMRU+obyYJONV6y803v FLv1GVwBEwUoGuFMJDY70OXq7o74xZN93CI62GHoKJqaTa4FP8m+rZRBlC9y3n8x 2k5W4T0XuAvj+dD+QZlTcC5xsRp5nmSyVo7CzjlxZp1yxnHa3Ymipm74qouwiji+ 5W/FWJS3Yi3dgct9wAtg4Ge9mhJytbz9g2gefGMP6EINq04eiAz1v3SfDD7UNGOB iIw/BpUUWKAa8vLQqr8YHe7r+NjaCZwoiJUWHVgMfB4cXJ46QaBuEQ==0wfV -----END PGP SIGNATURE----- -- 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+unsubscribe@googlegroups.com. For more options, visit this group at http://groups.google.com/group/puppet-users?hl=en.
You can even use git for an svn style workflow. For example, at my work, we have a local git repo for managing puppet configs, and then we periodically push those out to a backup server. git push ssh://backup.server/path/to/puppet/repo.git You can even use git with an already existing svn server. See http://andy.delcambre.com/2008/03/04/git-svn-workflow.html but why do that when you can just use git all around. So in the question of "svn or git?" the answer is always git! On Jan 14, 8:42 am, James Turnbull <ja...@lovedthanlost.net> wrote:> -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > On 15/01/10 12:36 AM, James Turnbull wrote: > > > > On 15/01/10 12:30 AM, SyRenity wrote: > > >> >> Thanks for sharing. How do you achieve centralization of all > multiple > >> >> git repos, in case you have several puppetmasters? > > > > I don''t - I have one central Git repo with multiple branches > > > matching my environments: > > I should have been clearer here - I maintain one central git repo > and check out branches to multiple puppetmasters. > > > > $ git branch > > > * master -> which is production > > > staging > > > testing > > > development > > > scrapyard > > > puppetbook > > > puppetbook2 > > For example production, staging, testing and development are > environments on one master. The Puppet book branches are checked > out to another master and the scrapyard has bits and pieces that I > use for testing and gets checked out in a few places. > > Regards > > James Turnbull > > - -- > Author of: > * Pro Linux System Administration (http://tinyurl.com/linuxadmin) > * Pulling Strings with Puppet (http://tinyurl.com/pupbook) > * Pro Nagios 2.0 (http://tinyurl.com/pronagios) > * Hardening Linux (http://tinyurl.com/hardeninglinux) > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1.4.7 (Darwin) > Comment: Using GnuPG with Mozilla -http://enigmail.mozdev.org/ > > iQEVAwUBS08fVSFa/lDkFHAyAQLMrwgAxn79MP67SmGrvkRgbHOGXuLuhC5CcZHk > NL51aLgZ6UCzY6+bNfuoo+OmC0yGiVn0mkizQePbL6SWuwMRU+obyYJONV6y803v > FLv1GVwBEwUoGuFMJDY70OXq7o74xZN93CI62GHoKJqaTa4FP8m+rZRBlC9y3n8x > 2k5W4T0XuAvj+dD+QZlTcC5xsRp5nmSyVo7CzjlxZp1yxnHa3Ymipm74qouwiji+ > 5W/FWJS3Yi3dgct9wAtg4Ge9mhJytbz9g2gefGMP6EINq04eiAz1v3SfDD7UNGOB > iIw/BpUUWKAa8vLQqr8YHe7r+NjaCZwoiJUWHVgMfB4cXJ46QaBuEQ=> =0wfV > -----END PGP SIGNATURE------- 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+unsubscribe@googlegroups.com. For more options, visit this group at http://groups.google.com/group/puppet-users?hl=en.
SyRenity <stas.oskin@gmail.com> writes:> Is there any advantage of using Git vs SVN when using puppet?We just finished switching from Subversion to Git because we wanted Git''s merging and cherry-pick support for maintaining separate production and development branches of our manifests. -- Russ Allbery (rra@stanford.edu) <http://www.eyrie.org/~eagle/> -- 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+unsubscribe@googlegroups.com. For more options, visit this group at http://groups.google.com/group/puppet-users?hl=en.