glenux-archive/vagrant-lxc-base-boxes
glenux-archive/vagrant-lxc-base-boxes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #11 from tripledes/trusty_puppet

Browse source 
Remove limitation for installing Puppet on trusty, 3.6.0 available from PuppetLabs repo
This commit is contained in:
Fabio Rehm 2014-05-29 10:41:18 -03:00
commit fa845da97e
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -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 * 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. 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 * Salt can't be installed on Ubuntu 13.04

2
debian/install-extras.sh vendored
View file

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