install_os_puppet incorrectly copies templates

[Tim McSweeney]

The script install_os_puppet adds an extra level in the /etc/puppet/templates directory.

root@coe-build:/etc/puppet/templates/templates# pwd
/etc/puppet/templates/templates
root@coe-build:/etc/puppet/templates/templates# ls
templates
root@coe-build:/etc/puppet/templates#

root@coe-build:~# puppet apply -v /etc/puppet/manifests/site.pp
info: Loading facts in /usr/share/puppet/modules/stdlib/lib/facter/pe_version.rb
info: Loading facts in /usr/share/puppet/modules/stdlib/lib/facter/root_home.rb
info: Loading facts in /usr/share/puppet/modules/stdlib/lib/facter/puppet_vardir.rb
info: Loading facts in /usr/share/puppet/modules/concat/lib/facter/concat_basedir.rb
Could not find template 'interfaces.erb' at /etc/puppet/manifests/cobbler-node.pp:41 on node coe-build.mitg-tew01.cisco.com
root@coe-build:~#

Line 139 shoud be:
   if ! run_cmd cp -R /root/cisco-grizzly-manifests/templates /etc/puppet ;then

or

  if ! run_cmd cp /root/cisco-grizzly-manifests/templates/* /etc/puppet/templates ;then

   136 if [ -d /root/cisco-grizzly-manifests/templates ]
   137 then
   138 echo "Copying templates to templates dir..."
   139 if ! run_cmd cp -R /root/cisco-grizzly-manifests/templates /etc/puppet/templates/ ;then
   140 echo "Can't copy templates!!!"
   141 exit 1
   142 fi
   143 fi

[Mark T. Voelker (mvoelker)]

Pull request to fix:
https://github.com/CiscoSystems/grizzly-manifests/pull/74