Skip to content

Commit

Permalink
more doc improvements, sleep in the provision
Browse files Browse the repository at this point in the history
  • Loading branch information
Terri Haber committed Feb 28, 2015
1 parent 5016ab6 commit 182392c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
8 changes: 8 additions & 0 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ Contains the scripts and files that are used to spin up the Vagrant VM. This is

If you want to avoid having to wait for PE to download during the provisioning process and you have the Puppet Enterprise tarball lying around, just copy it over to provision/pe and that step will be skipped.

The provision/provision.sh script contains the PE version that will be installed. You'll need to change it to downgrade/upgrade as needed.

### reference/
Reference materials for Puppet workflow.

Expand Down Expand Up @@ -126,6 +128,12 @@ is done for the role.
Classification for vagrant nodes are done via the
environment-specific `site.pp`

#### Vagrant usage

r10k on the vagrant xmaster uses the /vagrant mount as the remote. During the course of your testing, if you need to edit your files, you'll need to add and commit your changes (but don't push!) then use r10k to sync your code on your vagrant xmaster:

r10k deploy environmnet -p <environment> --verbose

## Bootstrapping your Puppet Master

Now that you have your basic puppet code all ready to go and you want to launch this on your live master...
Expand Down
3 changes: 3 additions & 0 deletions provision/bootstrap_r10k.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,8 @@ echo "APPLYING R10K"

/opt/puppet/bin/r10k deploy environment -p production --puppetfile \
--verbose debug
echo "Sleeping for 10 seconds while prod env is recognized"

sleep 10

/opt/puppet/bin/puppet agent -t

0 comments on commit 182392c

Please sign in to comment.