From e08add25ce4f8d66bf6730c06d351fc8ea12d90e Mon Sep 17 00:00:00 2001 From: Sergio Jimenez Date: Sat, 17 May 2014 12:54:46 +0200 Subject: [PATCH] Remove limitation for installing Puppet on trusty, 3.6.0 available from PuppetLabs repo --- README.md | 2 +- debian/install-extras.sh | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index a2421e6..a8d8cf1 100644 --- a/README.md +++ b/README.md @@ -63,5 +63,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 diff --git a/debian/install-extras.sh b/debian/install-extras.sh index 29671f1..bf87e87 100755 --- a/debian/install-extras.sh +++ b/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