<html>
<head>
<meta content="text/html; charset=ISO-8859-1"
http-equiv="Content-Type">
</head>
<body text="#000000" bgcolor="#FFFFFF">
<div class="moz-cite-prefix">On 11/20/13 10:01 AM, Petr Bena wrote:<br>
</div>
<blockquote
cite="mid:CA+4EQ5dD4jaLGmP2TbLoK0CFAFzKUONE5QFcEESgVfR1kMsYVw@mail.gmail.com"
type="cite">
<pre wrap="">Can you please elaborate more on what we need to do in case we have
instances with selfhosted puppet master?</pre>
</blockquote>
<br>
Yep! Also note that I do not at all mind doing this myself, so if
you have a problematic instance just let me know and I can clean
things up. I recently visited almost all of the self-hosted
instances and organized things, so probably your instances are in
reasonable shape already.<br>
<br>
To update yourself: <br>
<br>
First, figure out if you have local changes, and if they're already
organized into patches:<br>
<br>
$ cd /var/lib/git/operations/puppet<br>
$ git diff .<br>
<br>
Is there a diff? If so you need to organize it into one or more
patches and get them committed. Until 'git diff' runs cleanly the
next step will fail.<br>
<br>
Now that your local repo is organized, we want to rebase against
gerrit. Assuming you haven't done anything dramatic, this should do
the trick:<br>
<br>
$ sudo GIT_SSH=/var/lib/git/ssh git pull --rebase
<meta http-equiv="content-type" content="text/html;
charset=ISO-8859-1">
<br>
<br>
That rebase may fail with conflicts, depending on what local patches
you have. If so, you need to resolve the conflicts as you would
with any git rebase.<br>
<br>
Once things are rebasing properly...<br>
<br>
$ sudo puppetd -tv<br>
<br>
And look for errors or warnings, and fix them :)<br>
<br>
Doing all of this will get your instance so that it's clean and
ready for updates, but we'll still need to repeat the rebase by hand
when the actual migration happens. I'm not yet entirely sure how
that procedure will go, but I guarantee it will be much easier if
you follow the above steps ahead of time.<br>
<br>
-Andrew<br>
<br>
<br>
</body>
</html>