Merge pull request #11 from tripledes/trusty_puppet

Remove limitation for installing Puppet on trusty, 3.6.0 available from PuppetLabs repo

README.md

@@ -62,5 +62,5 @@ See [vagrant-lxc/BOXES.md](https://github.com/fgrehm/vagrant-lxc/blob/master/BOX
 
 * We can't get the NFS client to be installed on the containers used for building
   Ubuntu 13.04 / 13.10 / 14.04 base boxes.
-* Puppet can't be installed on Ubuntu 14.04 / Debian Sid
+* Puppet can't be installed on Debian Sid
 * Salt can't be installed on Ubuntu 13.04

debian/install-extras.sh

@@ -55,8 +55,6 @@ fi
 if [ $PUPPET = 1 ]; then
   if $(lxc-attach -n ${CONTAINER} -- which puppet &>/dev/null); then
     log "Puppet has been installed on container, skipping"
-  elif [ ${RELEASE} = 'trusty' ]; then
-    warn "Puppet can't be installed on Ubuntu Trusty 14.04, skipping"
   elif [ ${RELEASE} = 'sid' ]; then
     warn "Puppet can't be installed on Debian sid, skipping"
   else