Skip to content

Commit

Permalink
Minor update to bootstrap script and AMI id.
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrew Woods committed Jun 20, 2013
1 parent 733a678 commit ca39218
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion cloud-init/create-ec2-instance.conf
@@ -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=[...]
Expand Down
6 changes: 4 additions & 2 deletions 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.