Permalink
Browse files

Minor update to bootstrap script and AMI id.

  • Loading branch information...
1 parent 733a678 commit ca3921863780c3adb7ad448efa75b69bfdec6f47 @awoods awoods committed Jun 20, 2013
Showing with 5 additions and 3 deletions.
  1. +1 −1 cloud-init/create-ec2-instance.conf
  2. +4 −2 cloud-init/src/bootstrap.sh
@@ -1,5 +1,5 @@
aws_region=us-east-1
-aws_ami=ami-f3d1bb9a
+aws_ami=ami-e995e380
aws_instance_type=m1.large
aws_group=[...]
aws_key=[...]
View
6 cloud-init/src/bootstrap.sh 100644 → 100755
@@ -1,4 +1,6 @@
#!/bin/bash
+
set -ex
-CACHEDIR=/var/cache/cloud/puppet
-puppet apply --modulepath $CACHEDIR/modules -v $CACHEDIR/site/site.pp
+
+export CACHEDIR=/var/cache/cloud/puppet
+puppet apply -l /tmp/puppet.log --debug --modulepath $CACHEDIR/modules -v $CACHEDIR/site/site.pp

0 comments on commit ca39218

Please sign in to comment.