Changes between Version 4 and Version 5 of how-to/puppet

Timestamp:

Mar 8, 2011, 4:08:07 PM (15 years ago)

Author:

Jamie McClelland

Comment:

--

how-to/puppet

@@ +1 @@
+[[PageOutline]]
 = Puppet =
 
@@ -5 +6 @@
 == administering puppet ==
 
-puppet can be intimidating.  If you want to help with the administration, here's instructions to get started:
+puppet can be intimidating.  If you want to help with the administration, here's instructions to get started.
 
-=== setting up a development environment ===
+=== checking out the code ===
 
-Get the configuration:
+For read-only access (available to the public):
 
 {{{
 git clone git://git.mayfirst.org/mfpl/puppet
+}}}
+
+For write access (MFPL admins only):
+
+{{{
+git clone gitosis@git.mayfirst.org:mfpl/puppet
+}}}
+
+Then...
+
+{{{
 cd puppet
 git submodule init
 git submodule update
 }}}
+
+To get the most recent code after you've already checked out the repository:
+
+{{{
+git remote update
+# to review changes:
+git diff origin/master
+git merge origin/master
+# to pull in any updates to the submodules
+git submodule update
+}}}
+
+=== setting up a development environment ===
 
 And as the superuser, install the tools:
@@ -107 +132 @@
 }}}
 
+If you want, you can edit the .git/config file in each submodule, adding the following line under your mfpl-write stanza:
+
+{{{
+push = +HEAD:master
+}}}
+
+Then, you only need to type:
+
+{{{{
+git push mfpl-write
+}}}
+
+After you have made changes to a module (for example the mayfirst module), you need to add it with:
+
+{{{
+git add modules/mayfirst
+}}}
+
+Be sure ''not'' to include the trailing slash (thanks [https://we.riseup.net/riseup+tech/puppet-git-submodules Riseup for that and other tips on git submodules]).
+
+=== Pulling in changes to the master repo ===
+
+May First/People Link's Puppet Master server is on `rustin.mayfirst.org` which is aliased to puppetmaster.mayfirst.org.
+
+As root on rustin:
+
+{{{
+cd /etc/puppet
+git remote update
+}}}
+
+Next, check the last commit to make sure it matches the last commit you made (and want live):
+
+On your local machine:
+
+{{{
+git log -n1
+}}}
+
+Compared with, on rustin:
+
+{{{
+git log -n1 mfpl/master
+}}}
+
+If they match, then rebase (we rebase to ensure that our local changes to files on rustin are not merged):
+
+{{{
+git rebase mfpl/master
+}}}
+
+And lastly, restart puppetmaster:
+
+{{{
+/etc/init.d/puppetmaster restart
+}}}
+
+Now, if puppet is running as a daemon on the nodes, the changes will eventually propagate. If you are running puppet manually on a node, you can test manually with:
+
+{{{
+puppet agent --verbose --no-daemonize --onetime
+}}}