grizzly puppet packages and grizzly manifests diverged

[Chris Ricker]

Our grizzly puppet packages are from puppet modules with most of the recent folsom work merged

This same work hasn't been forward-ported to the grizzly manifests, and the mismatch leads to errors like

err: Could not retrieve catalog from remote server: Error 400 on SERVER: Invalid parameter crosstalk_ip at /etc/puppet/manifests/site.pp:193 on node conserv.sdu.lab
warning: Not using cache on failed catalog
err: Could not retrieve catalog; skipping run

[Michael Chapman (michaeltchapman)]

Grizzly manifests forked from folsom at commit c536cfdca2

root@coe-build:~/folsom-manifests# git rev-list ^c536cfd upstream/multi-node | wc -l
45

root@coe-build:~/grizzly/grizzly-manifests# git rev-list ^c536cfd multi-node | wc -l
10

I know I haven't ported any of mine forward, which accounts for 11 of those 45.

[Mark T. Voelker (mvoelker)]

This was resolved in https://github.com/CiscoSystems/grizzly-manifests/commit/2c8177c7c46936536ed1d591fb0f8eaa7951feb2 and it's predecessors I believe.