[Labs-l] operations/puppet.git change affecting users of role::puppet::self

[Bryan Davis]

FYI for users of role::puppet::self, a change to operations/puppet.git
merged today may require a `sudo rm -rf
/var/lib/git/operations/puppet/modules/varnish` the next time you try
to pull. Details in forwarded message below.

Bryan


---------- Forwarded message ----------
From: Brandon Black <bblack at wikimedia.org>
Date: Tue, Jun 24, 2014 at 1:30 PM
Subject: [Ops] varnish de-submodulization
To: Operations Engineers <ops at lists.wikimedia.org>



I undid the varnish submodule thing today, it has been way too painful
too many times lately.  History is preserved, all though when doing
"git show" from the formerly-submodule commits, you'll see the
submodule-like paths (e.g. templates/foo rather than
modules/varnish/templates/foo).

Regrettably, your first pull after this change won't work right
automatically.  It will spam something like:

Updating 676b373..778edfa
error: The following untracked working tree files would be overwritten by merge:
modules/varnish/files/ganglia/.pep8
modules/varnish/files/ganglia/ganglia-varnish.py
modules/varnish/files/ganglia/ganglia-vhtcpd.py
modules/varnish/files/reload-vcl
modules/varnish/files/varnishncsa.default
modules/varnish/files/zerofetch.py
modules/varnish/manifests/common.pp
modules/varnish/manifests/common/vcl.pp
modules/varnish/manifests/extra_vcl.pp
modules/varnish/manifests/htcppurger.pp
modules/varnish/manifests/init.pp
modules/varnish/manifests/instance.pp
modules/varnish/manifests/logging.pp
modules/varnish/manifests/logging/config.pp
modules/varnish/manifests/logging/monitor.pp
modules/varnish/manifests/monitoring/ganglia.pp
modules/varnish/manifests/monitoring/ganglia/vhtcpd.pp
modules/varnish/manifests/packages.pp
modules/varnish/manifests/setup_filesystem.pp
modules/varnish/manifests/zero_update.pp
modules/varnish/templates/ganglia/vhtcpd.pyconf.erb
modules/varnish/templates/varnish-default.erb
modules/varnish/templates/varnish.init.erb
modules/varnish/templates/varnishncsa.init.erb
modules/varnish/templates/vcl/wikimedia.vcl.erb
Please move or remove them before you can merge.

rm -rf modules/varnish in your local copy and then pull again gets past that.

Sorry for the mess, but I couldn't find a cleaner way to fix the other mess.
-- Brandon

_______________________________________________
Ops mailing list
Ops at lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/ops



-- 
Bryan Davis              Wikimedia Foundation    <bd808 at wikimedia.org>
[[m:User:BDavis_(WMF)]]  Sr Software Engineer            Boise, ID USA
irc: bd808                                        v:415.839.6885 x6855